summaryrefslogtreecommitdiff
path: root/source3/smbd/service.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-04-29 13:35:00 +0200
committerVolker Lendecke <vl@samba.org>2008-05-05 18:28:58 +0200
commitbb3755968f5e953340edfb0b71997dddc11badb9 (patch)
tree82fc55583ae6a2c1a689ff654a330cd110d6d66a /source3/smbd/service.c
parentfaa5e8e12c58376db0323a4e4855454ed53dcc00 (diff)
downloadsamba-bb3755968f5e953340edfb0b71997dddc11badb9.tar.gz
samba-bb3755968f5e953340edfb0b71997dddc11badb9.tar.bz2
samba-bb3755968f5e953340edfb0b71997dddc11badb9.zip
Remove "nt_user_token" from "struct user_struct"
(This used to be commit 51d5d512f28eadc74eced43e5e7f4e5bdff3ff69)
Diffstat (limited to 'source3/smbd/service.c')
-rw-r--r--source3/smbd/service.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index a405ffc9bc..a286e561c7 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -725,7 +725,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
}
} else {
if (!user_ok_token(vuser->user.unix_name,
- vuser->nt_user_token, snum)) {
+ vuser->server_info->ptok, snum)) {
DEBUG(2, ("user '%s' (from session setup) not "
"permitted to access this share "
"(%s)\n", vuser->user.unix_name,
@@ -861,7 +861,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
* group. vuser has a token to copy */
conn->nt_user_token = dup_nt_token(
- NULL, vuser->nt_user_token);
+ NULL, vuser->server_info->ptok);
if (conn->nt_user_token == NULL) {
DEBUG(0, ("dup_nt_token failed\n"));
conn_free(conn);
@@ -948,7 +948,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
bool can_write = False;
NT_USER_TOKEN *token = conn->nt_user_token ?
conn->nt_user_token :
- (vuser ? vuser->nt_user_token : NULL);
+ (vuser ? vuser->server_info->ptok : NULL);
/*
* I don't believe this can happen. But the