From 71ff1ba2deddf8fa12b034518e92e0a461871388 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 29 Apr 2008 13:45:58 +0200 Subject: Remove "guest" from "struct user_struct" (This used to be commit 570a6b80feb5b0dc23213ba936c721e766cd4818) --- source3/smbd/password.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source3/smbd/password.c') diff --git a/source3/smbd/password.c b/source3/smbd/password.c index c5c0245444..6305180e6f 100644 --- a/source3/smbd/password.c +++ b/source3/smbd/password.c @@ -269,7 +269,6 @@ int register_existing_vuid(uint16 vuid, talloc_steal(vuser, vuser->server_info); - vuser->guest = server_info->guest; fstrcpy(vuser->user.unix_name, server_info->unix_name); /* This is a potentially untrusted username */ @@ -286,7 +285,7 @@ int register_existing_vuid(uint16 vuid, (unsigned int)vuser->server_info->uid, (unsigned int)vuser->server_info->gid, vuser->user.unix_name, vuser->user.smb_name, - vuser->user.domain, vuser->guest )); + vuser->user.domain, vuser->server_info->guest )); DEBUG(3, ("register_existing_vuid: User name: %s\t" "Real name: %s\n", vuser->user.unix_name, @@ -320,12 +319,12 @@ int register_existing_vuid(uint16 vuid, vuser->homes_snum = -1; - if (!vuser->guest) { + if (!vuser->server_info->guest) { vuser->homes_snum = register_homes_share( vuser->user.unix_name); } - if (srv_is_signing_negotiated() && !vuser->guest && + if (srv_is_signing_negotiated() && !vuser->server_info->guest && !srv_signing_started()) { /* Try and turn on server signing on the first non-guest * sessionsetup. */ -- cgit