summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-08-03 01:49:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:29 -0500
commitdca7d08e61ecd0f6695a05c44feb58abbc2d8826 (patch)
tree698ffcb714d7acb722f47dc69d47e44836d0cdb6
parentf569db1c06848b4205c141938e0d11359855673e (diff)
downloadsamba-dca7d08e61ecd0f6695a05c44feb58abbc2d8826.tar.gz
samba-dca7d08e61ecd0f6695a05c44feb58abbc2d8826.tar.bz2
samba-dca7d08e61ecd0f6695a05c44feb58abbc2d8826.zip
r17378: Fix the issues people have been having with mapped
users (username map) and failure to connect to a share. Essentially, even on a standalone system we were going into the create_token_from_username() code (I think by mistake) if the username was mapped. Fixes bug #3991. Volker & Jerry - please go over this with a very careful eye and let me know if this isn't correct (I think it is, but this isn't my code and it's a dangerous area for me to be playing in :-). Jeremy (This used to be commit 0b5b2b53ec6e4c25b5f6645451dfce4aa7ae8a61)
-rw-r--r--source3/auth/auth_util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index dfb4193357..d59c6b40cc 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -956,8 +956,8 @@ NTSTATUS create_local_token(auth_serversupplied_info *server_info)
* mapped to some local unix user.
*/
- if (((lp_server_role() == ROLE_DOMAIN_MEMBER) && !winbind_ping()) ||
- (server_info->was_mapped)) {
+ if ((lp_server_role() == ROLE_DOMAIN_MEMBER) &&
+ (server_info->was_mapped || !winbind_ping())) {
status = create_token_from_username(server_info,
server_info->unix_name,
server_info->guest,