summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-03-02 20:15:11 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:18:22 -0500
commit9f8e8e1aac9262da22036e7aacca26e164450889 (patch)
tree8710d4ce3b2986612e18b516dacf69216ee62117 /source3/utils
parent36f20fca7b01ed823b6fc7cb1e1deedf4195d2d4 (diff)
downloadsamba-9f8e8e1aac9262da22036e7aacca26e164450889.tar.gz
samba-9f8e8e1aac9262da22036e7aacca26e164450889.tar.bz2
samba-9f8e8e1aac9262da22036e7aacca26e164450889.zip
r21663: Fix from the Wine guys: Robert Shearman <rob@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@domain" and this is converted into an NTLMSSP_AUTH packet with a NULL domain name and a username of the same form. Jeremy. (This used to be commit 32b040fe05707d5ce6322cb41d36cfdd2c3b31fc)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/ntlm_auth.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 1e7b361e86..1f0a915574 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -2303,7 +2303,8 @@ enum {
}
}
- if (opt_domain == NULL || !*opt_domain) {
+ /* Note: if opt_domain is "" then send no domain */
+ if (opt_domain == NULL) {
opt_domain = get_winbind_domain();
}