Changeset 124 for branches/samba-3.0/source/smbd/sesssetup.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/sesssetup.c (modified) (9 diffs)

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

@@ -629 +629 @@
                 auth_ntlmssp_end(auth_ntlmssp_state);
                 /* Kill the intermediate vuid */
-                invalidate_vuid(vuid);
+                invalidate_intermediate_vuid(vuid);
         }
 
@@ -695 +695 @@
         if (!NT_STATUS_IS_OK(status)) {
                 /* Kill the intermediate vuid */
-                invalidate_vuid(vuid);
+                invalidate_intermediate_vuid(vuid);
                 return ERROR_NT(nt_status_squash(status));
         }
@@ -709 +709 @@
                 if (destroy_vuid) {
                         /* Kill the intermediate vuid */
-                        invalidate_vuid(vuid);
+                        invalidate_intermediate_vuid(vuid);
                 }
                 return ret;
         }
 #endif
+
+        if (got_kerberos_mechanism) {
+                invalidate_intermediate_vuid(vuid);
+                DEBUG(3,("reply_spnego_negotiate: network "
+                        "misconfiguration, client sent us a "
+                        "krb5 ticket and kerberos security "
+                        "not enabled"));
+                return ERROR_NT(nt_status_squash(NT_STATUS_LOGON_FAILURE));
+        }
 
         if (*auth_ntlmssp_state) {
@@ -722 +731 @@
         if (!NT_STATUS_IS_OK(status)) {
                 /* Kill the intermediate vuid */
-                invalidate_vuid(vuid);
+                invalidate_intermediate_vuid(vuid);
                 return ERROR_NT(nt_status_squash(status));
         }
@@ -760 +769 @@
 #endif
                 /* Kill the intermediate vuid */
-                invalidate_vuid(vuid);
-
-                return ERROR_NT(nt_status_squash(NT_STATUS_INVALID_PARAMETER));
+                invalidate_intermediate_vuid(vuid);
+
+                return ERROR_NT(nt_status_squash(NT_STATUS_LOGON_FAILURE));
         }
 
@@ -781 +790 @@
                                 if (destroy_vuid) {
                                         /* Kill the intermediate vuid */
-                                        invalidate_vuid(vuid);
+                                        invalidate_intermediate_vuid(vuid);
                                 }
                                 return ret;
@@ -791 +800 @@
         /* If we get here it wasn't a negTokenTarg auth packet. */
         data_blob_free(&secblob);
-        
+
         if (!*auth_ntlmssp_state) {
                 /* Kill the intermediate vuid */
-                invalidate_vuid(vuid);
+                invalidate_intermediate_vuid(vuid);
 
                 /* auth before negotiatiate? */
-                return ERROR_NT(nt_status_squash(NT_STATUS_INVALID_PARAMETER));
-        }
-        
-        status = auth_ntlmssp_update(*auth_ntlmssp_state, 
+                return ERROR_NT(NT_STATUS_LOGON_FAILURE);
+        }
+
+        status = auth_ntlmssp_update(*auth_ntlmssp_state,
                                         auth, &auth_reply);
 
         data_blob_free(&auth);
 
-        reply_spnego_ntlmssp(conn, inbuf, outbuf, vuid, 
+        reply_spnego_ntlmssp(conn, inbuf, outbuf, vuid,
                              auth_ntlmssp_state,
                              &auth_reply, status, True);
-                
+
         data_blob_free(&auth_reply);
 
@@ -1117 +1126 @@
                 if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
                         /* Real error - kill the intermediate vuid */
-                        invalidate_vuid(vuid);
+                        invalidate_intermediate_vuid(vuid);
                 }
                 data_blob_free(&blob1);
@@ -1145 +1154 @@
                         if (!NT_STATUS_IS_OK(status)) {
                                 /* Kill the intermediate vuid */
-                                invalidate_vuid(vuid);
+                                invalidate_intermediate_vuid(vuid);
                                 data_blob_free(&blob1);
                                 return ERROR_NT(nt_status_squash(status));