diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-06-10 16:08:12 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-06-11 11:44:07 +0200 |
| commit | 6aee8021a14a2878f2bb7f393e2b93721925f92a (patch) | |
| tree | 9d554eac8872a038ff72442b3c41dea7e88a9277 | |
| parent | 29ff3ce56894d5ef0254c85d6ae9e68733558901 (diff) | |
| download | samba-6aee8021a14a2878f2bb7f393e2b93721925f92a.tar.gz samba-6aee8021a14a2878f2bb7f393e2b93721925f92a.tar.bz2 samba-6aee8021a14a2878f2bb7f393e2b93721925f92a.zip | |
s3-smbd: Remove unused branches in negprot since security=share was removed
| -rw-r--r-- | source3/smbd/negprot.c | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index 6d533334dd..93af42b5c1 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -69,9 +69,7 @@ static void reply_lanman1(struct smb_request *req, uint16 choice) sconn->smb1.negprot.encrypted_passwords = lp_encrypted_passwords(); - if (lp_security()>=SEC_USER) { - secword |= NEGOTIATE_SECURITY_USER_LEVEL; - } + secword |= NEGOTIATE_SECURITY_USER_LEVEL; if (sconn->smb1.negprot.encrypted_passwords) { secword |= NEGOTIATE_SECURITY_CHALLENGE_RESPONSE; } @@ -116,9 +114,7 @@ static void reply_lanman2(struct smb_request *req, uint16 choice) sconn->smb1.negprot.encrypted_passwords = lp_encrypted_passwords(); - if (lp_security()>=SEC_USER) { - secword |= NEGOTIATE_SECURITY_USER_LEVEL; - } + secword |= NEGOTIATE_SECURITY_USER_LEVEL; if (sconn->smb1.negprot.encrypted_passwords) { secword |= NEGOTIATE_SECURITY_CHALLENGE_RESPONSE; } @@ -299,9 +295,7 @@ static void reply_nt1(struct smb_request *req, uint16 choice) if (lp_host_msdfs()) capabilities |= CAP_DFS; - if (lp_security() >= SEC_USER) { - secword |= NEGOTIATE_SECURITY_USER_LEVEL; - } + secword |= NEGOTIATE_SECURITY_USER_LEVEL; if (sconn->smb1.negprot.encrypted_passwords) { secword |= NEGOTIATE_SECURITY_CHALLENGE_RESPONSE; } @@ -310,18 +304,11 @@ static void reply_nt1(struct smb_request *req, uint16 choice) signing_required = smb_signing_is_mandatory(req->sconn->smb1.signing_state); if (signing_enabled) { - if (lp_security() >= SEC_USER) { - secword |= NEGOTIATE_SECURITY_SIGNATURES_ENABLED; - /* No raw mode with smb signing. */ - capabilities &= ~CAP_RAW_MODE; - if (signing_required) { - secword |=NEGOTIATE_SECURITY_SIGNATURES_REQUIRED; - } - } else { - DEBUG(0,("reply_nt1: smb signing is incompatible with share level security !\n")); - if (signing_required) { - exit_server_cleanly("reply_nt1: smb signing required and share level security selected."); - } + secword |= NEGOTIATE_SECURITY_SIGNATURES_ENABLED; + /* No raw mode with smb signing. */ + capabilities &= ~CAP_RAW_MODE; + if (signing_required) { + secword |=NEGOTIATE_SECURITY_SIGNATURES_REQUIRED; } } |