svn commit: samba r21663 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_25/source/utils

[jra at samba.org]

Author: jra
Date: 2007-03-02 20:15:11 +0000 (Fri, 02 Mar 2007)
New Revision: 21663

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

Log:
Fix from the Wine guys: Robert Shearman <rob at codeweavers.com>
The background behind this patch is that we're using ntlm_auth with
Wine. Windows allows us to pass in a NULL domain and a username of the
form of "user at domain" and this is converted into an NTLMSSP_AUTH packet
with a NULL domain name and a username of the same form.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/utils/ntlm_auth.c
   branches/SAMBA_3_0_25/source/utils/ntlm_auth.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/ntlm_auth.c
===================================================================
--- branches/SAMBA_3_0/source/utils/ntlm_auth.c	2007-03-02 19:13:58 UTC (rev 21662)
+++ branches/SAMBA_3_0/source/utils/ntlm_auth.c	2007-03-02 20:15:11 UTC (rev 21663)
@@ -2303,7 +2303,8 @@
 		}
 	}
 
-	if (opt_domain == NULL || !*opt_domain) {
+	/* Note: if opt_domain is "" then send no domain */
+	if (opt_domain == NULL) {
 		opt_domain = get_winbind_domain();
 	}
 

Modified: branches/SAMBA_3_0_25/source/utils/ntlm_auth.c
===================================================================
--- branches/SAMBA_3_0_25/source/utils/ntlm_auth.c	2007-03-02 19:13:58 UTC (rev 21662)
+++ branches/SAMBA_3_0_25/source/utils/ntlm_auth.c	2007-03-02 20:15:11 UTC (rev 21663)
@@ -2303,7 +2303,8 @@
 		}
 	}
 
-	if (opt_domain == NULL || !*opt_domain) {
+	/* Note: if opt_domain is "" then send no domain */
+	if (opt_domain == NULL) {
 		opt_domain = get_winbind_domain();
 	}