Changeset 124 for branches/samba-3.0/source/smbd/password.c

Timestamp:

Mar 12, 2008, 9:08:18 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

File:

• branches/samba-3.0/source/smbd/password.c (modified) (5 diffs)

branches/samba-3.0/source/smbd/password.c

@@ -92 +92 @@
         if (vuser == NULL)
                 return;
-        
+
         SAFE_FREE(vuser->homedir);
         SAFE_FREE(vuser->unix_homedir);
         SAFE_FREE(vuser->logon_script);
-        
+
+        if (vuser->auth_ntlmssp_state) {
+                auth_ntlmssp_end(&vuser->auth_ntlmssp_state);
+        }
+
         session_yield(vuser);
         SAFE_FREE(vuser->session_keystr);
@@ -112 +116 @@
         SAFE_FREE(vuser->groups);
         TALLOC_FREE(vuser->nt_user_token);
+
+        SAFE_FREE(vuser);
+        num_validated_vuids--;
+}
+
+void invalidate_intermediate_vuid(uint16 vuid)
+{
+        user_struct *vuser = get_partial_auth_user_struct(vuid);
+
+        if (vuser == NULL)
+                return;
+
+        if (vuser->auth_ntlmssp_state) {
+                auth_ntlmssp_end(&vuser->auth_ntlmssp_state);
+        }
+
+        DLIST_REMOVE(validated_users, vuser);
 
         SAFE_FREE(vuser);
@@ -164 +185 @@
         if (num_validated_vuids >= 0xFFFF-VUID_OFFSET) {
                 data_blob_free(&session_key);
+                TALLOC_FREE(server_info);
                 return UID_FIELD_INVALID;
         }
@@ -170 +192 @@
                 DEBUG(0,("Failed to malloc users struct!\n"));
                 data_blob_free(&session_key);
+                TALLOC_FREE(server_info);
                 return UID_FIELD_INVALID;
         }
@@ -176 +199 @@
 
         /* Allocate a free vuid. Yes this is a linear search... :-) */
-        while( get_valid_user_struct(next_vuid) != NULL ) {
+        while( (get_valid_user_struct(next_vuid) != NULL)
+               || (get_partial_auth_user_struct(next_vuid) != NULL) ) {
                 next_vuid++;
                 /* Check for vuid wrap. */