summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-15 17:57:35 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-07-20 09:17:10 +1000
commitf47662f363a433f43568b62af14be979c33109e1 (patch)
tree38759ccaeb08291420ee1e4a26ff22f8ae443e12
parent55ad1da888bccad47f2e60fc6dc077fd6ab14832 (diff)
downloadsamba-f47662f363a433f43568b62af14be979c33109e1.tar.gz
samba-f47662f363a433f43568b62af14be979c33109e1.tar.bz2
samba-f47662f363a433f43568b62af14be979c33109e1.zip
s3-auth Restore nss_token behaviour by reading from server_info
The implementation of copy_serverinfo(), used to copy server_info into session_info never copied the nss_token variable, and so 17d8f0ad30847bb940f645ee1817d782ddaaee74 introduced this regression. Andrew Bartlett Signed-off-by: Andrew Tridgell <tridge@samba.org>
-rw-r--r--source3/auth/auth_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 2b5f0a7c21..59850bb20e 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -502,7 +502,7 @@ NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
*/
if (((lp_server_role() == ROLE_DOMAIN_MEMBER) && !winbind_ping()) ||
- (session_info->nss_token)) {
+ (server_info->nss_token)) {
status = create_token_from_username(session_info,
session_info->unix_name,
session_info->guest,