summaryrefslogtreecommitdiffstats
path: root/source/auth
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-07-20 19:44:11 +0000
committerGerald Carter <jerry@samba.org>2006-07-20 19:44:11 +0000
commit64355e40a8b3545f28da465241b772fbd80d48ce (patch)
tree426226d4533390df3a789c7c6fa86f28b3d61662 /source/auth
parent57c21f4a80371d09288266cf797773a3f0fbd0b9 (diff)
downloadsamba-64355e40a8b3545f28da465241b772fbd80d48ce.tar.gz
samba-64355e40a8b3545f28da465241b772fbd80d48ce.tar.xz
samba-64355e40a8b3545f28da465241b772fbd80d48ce.zip
r17161: sync files from SAMBA_3_0_23 branch
Diffstat (limited to 'source/auth')
-rw-r--r--source/auth/auth_util.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 493d7393d07..5298560ba43 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -955,7 +955,8 @@ NTSTATUS create_local_token(auth_serversupplied_info *server_info)
return NT_STATUS_NO_MEMORY;
}
- if (server_info->was_mapped) {
+ if (((lp_server_role() == ROLE_DOMAIN_MEMBER) && !winbind_ping()) ||
+ server_info->was_mapped) {
status = create_token_from_username(server_info,
server_info->unix_name,
server_info->guest,