summaryrefslogtreecommitdiff
path: root/source4/smb_server
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-11-02 18:03:24 +0100
committerStefan Metzmacher <metze@samba.org>2011-11-03 16:55:11 +0100
commit71959d5e1ff0e524877081268ea4028e9cbbf9ed (patch)
tree34f8207dbc445004d6b354b9cb3d3740ecfc68b5 /source4/smb_server
parent908550f3c27c69d1a7f405a03bac86d985201670 (diff)
downloadsamba-71959d5e1ff0e524877081268ea4028e9cbbf9ed.tar.gz
samba-71959d5e1ff0e524877081268ea4028e9cbbf9ed.tar.bz2
samba-71959d5e1ff0e524877081268ea4028e9cbbf9ed.zip
s4:smb_server: change the default for "server signing" to "default"
metze
Diffstat (limited to 'source4/smb_server')
-rw-r--r--source4/smb_server/smb/signing.c5
-rw-r--r--source4/smb_server/smb2/negprot.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/source4/smb_server/smb/signing.c b/source4/smb_server/smb/signing.c
index 3e08e219ec..a3c91f6639 100644
--- a/source4/smb_server/smb/signing.c
+++ b/source4/smb_server/smb/signing.c
@@ -85,7 +85,7 @@ bool smbsrv_init_signing(struct smbsrv_connection *smb_conn)
}
signing_setting = lpcfg_server_signing(smb_conn->lp_ctx);
- if (signing_setting == SMB_SIGNING_AUTO) {
+ if (signing_setting == SMB_SIGNING_DEFAULT) {
/*
* If we are a domain controller, SMB signing is
* really important, as it can prevent a number of
@@ -106,6 +106,9 @@ bool smbsrv_init_signing(struct smbsrv_connection *smb_conn)
}
switch (signing_setting) {
+ case SMB_SIGNING_DEFAULT:
+ smb_panic(__location__);
+ break;
case SMB_SIGNING_OFF:
smb_conn->signing.allow_smb_signing = false;
break;
diff --git a/source4/smb_server/smb2/negprot.c b/source4/smb_server/smb2/negprot.c
index 892953635c..24521da42e 100644
--- a/source4/smb_server/smb2/negprot.c
+++ b/source4/smb_server/smb2/negprot.c
@@ -123,7 +123,7 @@ static NTSTATUS smb2srv_negprot_backend(struct smb2srv_request *req, struct smb2
ZERO_STRUCT(io->out);
signing_setting = lpcfg_server_signing(lp_ctx);
- if (signing_setting == SMB_SIGNING_AUTO) {
+ if (signing_setting == SMB_SIGNING_DEFAULT) {
/*
* If we are a domain controller, SMB signing is
* really important, as it can prevent a number of
@@ -144,6 +144,9 @@ static NTSTATUS smb2srv_negprot_backend(struct smb2srv_request *req, struct smb2
}
switch (signing_setting) {
+ case SMB_SIGNING_DEFAULT:
+ smb_panic(__location__);
+ break;
case SMB_SIGNING_OFF:
io->out.security_mode = 0;
break;