svn commit: samba r13911 - in branches/SAMBA_4_0/source/smb_server/smb: .

abartlet at samba.org abartlet at samba.org
Tue Mar 7 03:34:14 GMT 2006


Author: abartlet
Date: 2006-03-07 03:34:14 +0000 (Tue, 07 Mar 2006)
New Revision: 13911

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13911

Log:
Make these debug messages clearer.

Modified:
   branches/SAMBA_4_0/source/smb_server/smb/negprot.c


Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/smb/negprot.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/negprot.c	2006-03-07 03:33:26 UTC (rev 13910)
+++ branches/SAMBA_4_0/source/smb_server/smb/negprot.c	2006-03-07 03:34:14 UTC (rev 13911)
@@ -234,7 +234,7 @@
 	}
 	req_push_str(req, NULL, lp_workgroup(), -1, STR_UNICODE|STR_TERMINATE|STR_NOALIGN);
 	req_push_str(req, NULL, lp_netbios_name(), -1, STR_UNICODE|STR_TERMINATE|STR_NOALIGN);
-	DEBUG(3,("not using SPNEGO\n"));
+	DEBUG(3,("not using extended security (SPNEGO or NTLMSSP)\n"));
 }
 
 /****************************************************************************
@@ -387,7 +387,9 @@
 			}
 		}
 
-		if (!NT_STATUS_IS_OK(nt_status) && !NT_STATUS_EQUAL(nt_status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+		if (NT_STATUS_EQUAL(nt_status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+			DEBUG(3,("using SPNEGO\n"));
+		} else {
 			DEBUG(5, ("Failed to start SPNEGO, falling back to NTLMSSP only: %s\n", nt_errstr(nt_status)));
 			oid = GENSEC_OID_NTLMSSP;
 			nt_status = gensec_start_mech_by_oid(gensec_security, oid);
@@ -399,6 +401,7 @@
 			}
 			/* NTLMSSP is a client-first exchange */
 			blob = data_blob(NULL, 0);
+			DEBUG(3,("using raw-NTLMSSP\n"));
 		}
 
 		req->smb_conn->negotiate.oid = oid;
@@ -412,7 +415,6 @@
 		memcpy(req->out.ptr, blob.data, blob.length);
 		SCVAL(req->out.vwv+1, VWV(16), blob.length + 16);
 		req->out.ptr += blob.length;
-		DEBUG(3,("using SPNEGO\n"));
 	}
 	
 	smbsrv_send_reply_nosign(req);	



More information about the samba-cvs mailing list