s4-smb_server No longer follow the security=share smb.conf directive

[mat/samba.git] / source4 / smb_server / smb / negprot.c

diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c
index 2a31f9fc475e5451804b5d4e25d7c292fb851422..8621666f6a8b50399bae71ce591b055fc0b4add7 100644 (file)
--- a/source4/smb_server/smb/negprot.c
+++ b/source4/smb_server/smb/negprot.c
@@ -125,9 +125,6 @@ static void reply_lanman1(struct smbsrv_request *req, uint16_t choice)
 
        req->smb_conn->negotiate.encrypted_passwords = lpcfg_encrypted_passwords(req->smb_conn->lp_ctx);
 
-       if (lpcfg_security(req->smb_conn->lp_ctx) != SEC_SHARE)
-               secword |= NEGOTIATE_SECURITY_USER_LEVEL;
-
        if (req->smb_conn->negotiate.encrypted_passwords)
                secword |= NEGOTIATE_SECURITY_CHALLENGE_RESPONSE;
 
@@ -183,9 +180,6 @@ static void reply_lanman2(struct smbsrv_request *req, uint16_t choice)
 
        req->smb_conn->negotiate.encrypted_passwords = lpcfg_encrypted_passwords(req->smb_conn->lp_ctx);
   
-       if (lpcfg_security(req->smb_conn->lp_ctx) != SEC_SHARE)
-               secword |= NEGOTIATE_SECURITY_USER_LEVEL;
-
        if (req->smb_conn->negotiate.encrypted_passwords)
                secword |= NEGOTIATE_SECURITY_CHALLENGE_RESPONSE;
 
@@ -263,7 +257,6 @@ static void reply_nt1(struct smbsrv_request *req, uint16_t choice)
           supports it and we can do encrypted passwords */
        
        if (req->smb_conn->negotiate.encrypted_passwords && 
-           (lpcfg_security(req->smb_conn->lp_ctx) != SEC_SHARE) &&
            lpcfg_use_spnego(req->smb_conn->lp_ctx) &&
            (req->flags2 & FLAGS2_EXTENDED_SECURITY)) {
                negotiate_spnego = true; 
@@ -301,9 +294,7 @@ static void reply_nt1(struct smbsrv_request *req, uint16_t choice)
                capabilities |= CAP_DFS;
        }
        
-       if (lpcfg_security(req->smb_conn->lp_ctx) != SEC_SHARE) {
-               secword |= NEGOTIATE_SECURITY_USER_LEVEL;
-       }
+       secword |= NEGOTIATE_SECURITY_USER_LEVEL;
 
        if (req->smb_conn->negotiate.encrypted_passwords) {
                secword |= NEGOTIATE_SECURITY_CHALLENGE_RESPONSE;