From 716da104987293ea84035c50d5beae35081ea756 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 2 Nov 2011 17:48:45 +0100 Subject: s4:smb_server/smb: make the SMB_SIGNING_AUTO behavior a bit easier to follow The prepares a future change to SMB_SIGNING_DEFAULT. metze --- source4/smb_server/smb/signing.c | 44 +++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 19 deletions(-) (limited to 'source4/smb_server/smb') diff --git a/source4/smb_server/smb/signing.c b/source4/smb_server/smb/signing.c index 94ea74681c..3e08e219ec 100644 --- a/source4/smb_server/smb/signing.c +++ b/source4/smb_server/smb/signing.c @@ -77,12 +77,35 @@ bool smbsrv_setup_signing(struct smbsrv_connection *smb_conn, bool smbsrv_init_signing(struct smbsrv_connection *smb_conn) { + enum smb_signing_setting signing_setting; + smb_conn->signing.mac_key = data_blob(NULL, 0); if (!smbcli_set_signing_off(&smb_conn->signing)) { return false; } - - switch (lpcfg_server_signing(smb_conn->lp_ctx)) { + + signing_setting = lpcfg_server_signing(smb_conn->lp_ctx); + if (signing_setting == SMB_SIGNING_AUTO) { + /* + * If we are a domain controller, SMB signing is + * really important, as it can prevent a number of + * attacks on communications between us and the + * clients + * + * However, it really sucks (no sendfile, CPU + * overhead) performance-wise when used on a + * file server, so disable it by default + * on non-DCs + */ + + if (lpcfg_server_role(smb_conn->lp_ctx) >= ROLE_DOMAIN_CONTROLLER) { + signing_setting = SMB_SIGNING_REQUIRED; + } else { + signing_setting = SMB_SIGNING_OFF; + } + } + + switch (signing_setting) { case SMB_SIGNING_OFF: smb_conn->signing.allow_smb_signing = false; break; @@ -93,23 +116,6 @@ bool smbsrv_init_signing(struct smbsrv_connection *smb_conn) smb_conn->signing.allow_smb_signing = true; smb_conn->signing.mandatory_signing = true; break; - case SMB_SIGNING_AUTO: - /* If we are a domain controller, SMB signing is - * really important, as it can prevent a number of - * attacks on communications between us and the - * clients */ - - if (lpcfg_server_role(smb_conn->lp_ctx) == ROLE_DOMAIN_CONTROLLER) { - smb_conn->signing.allow_smb_signing = true; - smb_conn->signing.mandatory_signing = true; - } else { - /* However, it really sucks (no sendfile, CPU - * overhead) performance-wise when used on a - * file server, so disable it by default (auto - * is the default) on non-DCs */ - smb_conn->signing.allow_smb_signing = false; - } - break; } return true; } -- cgit