Changeset 221 for branches/samba-3.3.x/source/utils/ntlm_auth.c

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

File:

• branches/samba-3.3.x/source/utils/ntlm_auth.c (modified) (5 diffs)

branches/samba-3.3.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 */