diff options
| author | Stefan Metzmacher <metze@samba.org> | 2016-04-20 16:34:28 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2016-04-29 12:06:26 +0200 |
| commit | 2ceed5d946276c388e96ce278df50663855570b9 (patch) | |
| tree | 0d8823a84556c10b866ef8d3e8d2f18bf54b7b04 | |
| parent | a2e3c76601b8408ea0afcf26bd6fd694314fafe5 (diff) | |
| download | samba-2ceed5d946276c388e96ce278df50663855570b9.tar.gz | |
s3:smbd: only mark real guest sessions with the GUEST flag
Real anonymous sessions don't get it.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11847
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
(similar to commit 79a71545bfc87525c6ba6c8fe9fa7d8a9da33441)
| -rw-r--r-- | source3/smbd/sesssetup.c | 6 | ||||
| -rw-r--r-- | source3/smbd/smb2_sesssetup.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 1dbc1806ebe..77b80776cbe 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -285,7 +285,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req) return; } - if (security_session_user_level(session_info, NULL) < SECURITY_USER) { + if (security_session_user_level(session_info, NULL) == SECURITY_GUEST) { action |= SMB_SETUP_GUEST; } @@ -411,7 +411,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req) return; } - if (security_session_user_level(session_info, NULL) < SECURITY_USER) { + if (security_session_user_level(session_info, NULL) == SECURITY_GUEST) { action |= SMB_SETUP_GUEST; } @@ -939,7 +939,7 @@ void reply_sesssetup_and_X(struct smb_request *req) /* perhaps grab OS version here?? */ } - if (security_session_user_level(session_info, NULL) < SECURITY_USER) { + if (security_session_user_level(session_info, NULL) == SECURITY_GUEST) { action |= SMB_SETUP_GUEST; } diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c index 8b239c9b3b0..c738856110d 100644 --- a/source3/smbd/smb2_sesssetup.c +++ b/source3/smbd/smb2_sesssetup.c @@ -202,11 +202,12 @@ static NTSTATUS smbd_smb2_auth_generic_return(struct smbXsrv_session *session, } if (security_session_user_level(session_info, NULL) < SECURITY_USER) { - /* we map anonymous to guest internally */ - *out_session_flags |= SMB2_SESSION_FLAG_IS_GUEST; - *out_session_flags |= SMB2_SESSION_FLAG_IS_NULL; + if (security_session_user_level(session_info, NULL) == SECURITY_GUEST) { + *out_session_flags |= SMB2_SESSION_FLAG_IS_GUEST; + } /* force no signing */ x->global->signing_required = false; + /* we map anonymous to guest internally */ guest = true; } |