summaryrefslogtreecommitdiff
path: root/source3/auth
diff options
context:
space:
mode:
Diffstat (limited to 'source3/auth')
-rw-r--r--source3/auth/auth_util.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index a4dea39d2d..587273d9b6 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -196,12 +196,17 @@ BOOL make_user_info_map(auth_usersupplied_info **user_info,
fstrcpy(internal_username, smb_name);
map_username(internal_username);
- if (lp_allow_trusted_domains()) {
+ if (lp_allow_trusted_domains() && *client_domain) {
+
/* the client could have given us a workstation name
or other crap for the workgroup - we really need a
way of telling if this domain name is one of our
trusted domain names
+ Also don't allow "" as a domain, fixes a Win9X bug
+ where it doens't supply a domain for logon script
+ 'net use' commands.
+
The way I do it here is by checking if the fully
qualified username exists. This is rather reliant
on winbind, but until we have a better method this