Changeset 233 for branches/samba-3.2.x/source/utils

Timestamp:

May 27, 2009, 11:39:15 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.9

Location:

branches/samba-3.2.x/source/utils

Files:

• net_conf.c (modified) (1 diff)
• net_rpc.c (modified) (2 diffs)
• net_rpc_join.c (modified) (1 diff)
• net_rpc_samsync.c (modified) (1 diff)
• ntlm_auth.c (modified) (5 diffs)

branches/samba-3.2.x/source/utils/net_conf.c

@@ -550 +550 @@
         }
 
-        if (getpwnam(sharename)) {
-                d_fprintf(stderr, "ERROR: share name %s is already a valid "
-                          "system user name.\n", sharename);
-                goto done;
-        }
-
         if (strequal(sharename, GLOBAL_NAME)) {
                 d_fprintf(stderr,

branches/samba-3.2.x/source/utils/net_rpc.c

@@ -4607 +4607 @@
         int ret;
         bool r;
-        ENUM_HND hnd;
         uint32 i;
         FILE *f;
@@ -4644 +4643 @@
         for (i=0; i<num_tokens; i++)
                 collect_alias_memberships(&tokens[i].token);
-
-        init_enum_hnd(&hnd, 0);
 
         share_list.num_shares = 0;

branches/samba-3.2.x/source/utils/net_rpc_join.c

@@ -482 +482 @@
 int net_rpc_testjoin(int argc, const char **argv) 
 {
-        char *domain = smb_xstrdup(opt_target_workgroup);
         NTSTATUS nt_status;
 
         /* Display success or failure */
-        nt_status = net_rpc_join_ok(domain, NULL, NULL);
+        nt_status = net_rpc_join_ok(opt_target_workgroup, NULL, NULL);
         if (!NT_STATUS_IS_OK(nt_status)) {
                 fprintf(stderr,"Join to domain '%s' is not valid: %s\n",
-                        domain, nt_errstr(nt_status));
-                free(domain);
+                        opt_target_workgroup, nt_errstr(nt_status));
                 return -1;
         }
 
-        printf("Join to '%s' is OK\n",domain);
-        free(domain);
+        printf("Join to '%s' is OK\n",opt_target_workgroup);
         return 0;
 }

branches/samba-3.2.x/source/utils/net_rpc_samsync.c

@@ -2254 +2254 @@
                 } /* end of for loop */
 
-                /* Increment sync_context */
-                sync_context += 1;
-
         } while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
 

branches/samba-3.2.x/source/utils/ntlm_auth.c

@@ -524 +524 @@
         static const char zeros[16] = { 0, };
         NTSTATUS nt_status;
-        char *error_string;
+        char *error_string = NULL;
         uint8 lm_key[8]; 
         uint8 user_sess_key[16]; 
-        char *unix_name;
+        char *unix_name = NULL;
 
         nt_status = contact_winbind_auth_crap(ntlmssp_state->user, ntlmssp_state->domain,
@@ -549 +549 @@
                 }
                 ntlmssp_state->auth_context = talloc_strdup(ntlmssp_state->mem_ctx, unix_name);
-                SAFE_FREE(unix_name);
         } else {
                 DEBUG(NT_STATUS_EQUAL(nt_status, NT_STATUS_ACCESS_DENIED) ? 0 : 3, 
@@ -558 +557 @@
                 ntlmssp_state->auth_context = NULL;
         }
+
+        SAFE_FREE(error_string);
+        SAFE_FREE(unix_name);
         return nt_status;
 }
@@ -1815 +1817 @@
                                 x_fprintf(x_stdout, "Authenticated: No\n");
                                 x_fprintf(x_stdout, "Authentication-Error: %s\n.\n", error_string);
-                                SAFE_FREE(error_string);
                         } else {
                                 static char zeros[16];
@@ -1843 +1844 @@
                                 }
                         }
+                        SAFE_FREE(error_string);
                 }
                 /* clear out the state */