Changeset 454 for trunk/server/source3/utils

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/utils

Files:

• net_g_lock.c (added)
• net_usershare.c (modified) (2 diffs)
• net_util.c (modified) (1 diff)

trunk/server/source3/utils/net_usershare.c

@@ -946 +946 @@
 
         /* Attempt to replace any existing share by this name. */
+#ifdef __OS2__
+        close(tmpfd);
+#endif
         if (rename(full_path_tmp, full_path) != 0) {
                 unlink(full_path_tmp);
@@ -957 +960 @@
         }
 
+#ifndef __OS2__
         close(tmpfd);
+#endif
 
         if (c->opt_long_list_entries) {

trunk/server/source3/utils/net_util.c

@@ -100 +100 @@
         int flags = 0;
 
+#ifdef __OS2__
+        if (!c->opt_user_name || c->opt_user_name == NULL) {
+                d_printf("The username was not set.\n");
+                return NT_STATUS_LOGON_FAILURE;
+        }
+#endif
+
         c->opt_password = net_prompt_pass(c, c->opt_user_name);