Changeset 454 for trunk/server/source3/libsmb

Timestamp:

Jun 4, 2010, 3:11:43 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

Location:

trunk/server/source3/libsmb

Files:

• clientgen.c (modified) (2 diffs)
• clifile.c (modified) (2 diffs)

trunk/server/source3/libsmb/clientgen.c

@@ -567 +567 @@
         bool mandatory_signing = false;
 
+#ifndef __OS2__
         /* Check the effective uid - make sure we are not setuid */
         if (is_setuid_root()) {
@@ -572 +573 @@
                 return NULL;
         }
+#endif
 
         cli = TALLOC_ZERO_P(NULL, struct cli_state);

trunk/server/source3/libsmb/clifile.c

@@ -4360 +4360 @@
                         &setup, 1, 0,   /* setup, length, max */
                         param, param_len, 10, /* param, length, max */
+#ifdef __OS2__
+                        NULL, data_len, CLI_BUFFER_SIZE /* data, length, max */
+#else
                         NULL, data_len, cli->max_xmit /* data, length, max */
+#endif
                                 )) {
                 return False;
@@ -4502 +4506 @@
         memset(param, 0, 6);
         SSVAL(param,0,fnum);
+#ifndef __OS2__
         SSVAL(param,2,SMB_INFO_SET_EA);
+#else
+        SSVAL(param,2,SMB_INFO_QUERY_ALL_EAS);
+#endif
 
         return cli_get_ea_list(cli, setup, param, 6, ctx, pnum_eas, pea_list);