The branch, master has been updated via d3e5a0b s3:smbd: explicitly ask for GENSEC_FEATURE_UNIX_TOKEN from bd164ac Revert "make paranoia check less paranoid" - check that key types strictly match
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d3e5a0bea4595891014fafe75a34f155e789cef3 Author: Stefan Metzmacher <me...@samba.org> Date: Wed Jan 11 22:25:38 2012 +0100 s3:smbd: explicitly ask for GENSEC_FEATURE_UNIX_TOKEN metze Autobuild-User: Stefan Metzmacher <me...@samba.org> Autobuild-Date: Thu Jan 12 11:22:53 CET 2012 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source3/smbd/sesssetup.c | 3 +++ source3/smbd/smb2_sesssetup.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 08a3c2c..ca380a8 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -634,6 +634,7 @@ static void reply_spnego_negotiate(struct smb_request *req, } gensec_want_feature(*gensec_security, GENSEC_FEATURE_SESSION_KEY); + gensec_want_feature(*gensec_security, GENSEC_FEATURE_UNIX_TOKEN); status = gensec_start_mech_by_oid(*gensec_security, GENSEC_OID_NTLMSSP); if (!NT_STATUS_IS_OK(status)) { @@ -746,6 +747,7 @@ static void reply_spnego_auth(struct smb_request *req, } gensec_want_feature(*gensec_security, GENSEC_FEATURE_SESSION_KEY); + gensec_want_feature(*gensec_security, GENSEC_FEATURE_UNIX_TOKEN); status = gensec_start_mech_by_oid(*gensec_security, GENSEC_OID_NTLMSSP); if (!NT_STATUS_IS_OK(status)) { @@ -1155,6 +1157,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req) } gensec_want_feature(vuser->gensec_security, GENSEC_FEATURE_SESSION_KEY); + gensec_want_feature(vuser->gensec_security, GENSEC_FEATURE_UNIX_TOKEN); if (sconn->use_gensec_hook) { status = gensec_start_mech_by_oid(vuser->gensec_security, GENSEC_OID_SPNEGO); diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c index 017319e..0cd24c9 100644 --- a/source3/smbd/smb2_sesssetup.c +++ b/source3/smbd/smb2_sesssetup.c @@ -381,6 +381,7 @@ static NTSTATUS smbd_smb2_spnego_negotiate(struct smbd_smb2_session *session, } gensec_want_feature(session->gensec_security, GENSEC_FEATURE_SESSION_KEY); + gensec_want_feature(session->gensec_security, GENSEC_FEATURE_UNIX_TOKEN); status = gensec_start_mech_by_oid(session->gensec_security, GENSEC_OID_NTLMSSP); if (!NT_STATUS_IS_OK(status)) { @@ -569,6 +570,7 @@ static NTSTATUS smbd_smb2_spnego_auth(struct smbd_smb2_session *session, } gensec_want_feature(session->gensec_security, GENSEC_FEATURE_SESSION_KEY); + gensec_want_feature(session->gensec_security, GENSEC_FEATURE_UNIX_TOKEN); status = gensec_start_mech_by_oid(session->gensec_security, GENSEC_OID_NTLMSSP); if (!NT_STATUS_IS_OK(status)) { @@ -643,6 +645,7 @@ static NTSTATUS smbd_smb2_raw_ntlmssp_auth(struct smbd_smb2_session *session, } gensec_want_feature(session->gensec_security, GENSEC_FEATURE_SESSION_KEY); + gensec_want_feature(session->gensec_security, GENSEC_FEATURE_UNIX_TOKEN); if (session->sconn->use_gensec_hook) { status = gensec_start_mech_by_oid(session->gensec_security, GENSEC_OID_SPNEGO); -- Samba Shared Repository