diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-11-02 19:07:45 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-11-03 16:55:13 +0100 |
| commit | caa134672c053f56360ef602b7f8b9d66b216ad3 (patch) | |
| tree | 318f702fce63bc308d8cbe59f0066cd1f1ef0ba8 /source3/smbd/negprot.c | |
| parent | 7de694974eb234ed45f907196f6415da998b23da (diff) | |
| download | samba-caa134672c053f56360ef602b7f8b9d66b216ad3.tar.gz samba-caa134672c053f56360ef602b7f8b9d66b216ad3.tar.bz2 samba-caa134672c053f56360ef602b7f8b9d66b216ad3.zip | |
s3:smbd: make use of SMB_SIGNING_* constants
metze
Diffstat (limited to 'source3/smbd/negprot.c')
| -rw-r--r-- | source3/smbd/negprot.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index a0ed52d659..3afa8b19e3 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -368,16 +368,16 @@ static void reply_nt1(struct smb_request *req, uint16 choice) secword |= NEGOTIATE_SECURITY_CHALLENGE_RESPONSE; } - if (lp_server_signing()) { + if (lp_server_signing() != SMB_SIGNING_OFF) { if (lp_security() >= SEC_USER) { secword |= NEGOTIATE_SECURITY_SIGNATURES_ENABLED; /* No raw mode with smb signing. */ capabilities &= ~CAP_RAW_MODE; - if (lp_server_signing() == Required) + if (lp_server_signing() == SMB_SIGNING_REQUIRED) secword |=NEGOTIATE_SECURITY_SIGNATURES_REQUIRED; } else { DEBUG(0,("reply_nt1: smb signing is incompatible with share level security !\n")); - if (lp_server_signing() == Required) { + if (lp_server_signing() == SMB_SIGNING_REQUIRED) { exit_server_cleanly("reply_nt1: smb signing required and share level security selected."); } } @@ -736,7 +736,8 @@ void reply_negprot(struct smb_request *req) DEBUG( 5, ( "negprot index=%d\n", choice ) ); - if ((lp_server_signing() == Required) && (get_Protocol() < PROTOCOL_NT1)) { + if ((lp_server_signing() == SMB_SIGNING_REQUIRED) + && (get_Protocol() < PROTOCOL_NT1)) { exit_server_cleanly("SMB signing is required and " "client negotiated a downlevel protocol"); } |