CVE-2016-2115: docs-xml: always default "client ipc signing" to "mandatory"

[samba.git] / source3 / param / loadparm.c

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index a893c5db9396e31dfe45d1e01cb3b9bb2e036abb..47d2a929834526dee37486dfd9f905925327c19f 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4438,15 +4438,6 @@ int lp_client_max_protocol(void)
        return client_max_protocol;
 }
 
-int lp_winbindd_max_protocol(void)
-{
-       int client_max_protocol = lp__client_max_protocol();
-       if (client_max_protocol == PROTOCOL_DEFAULT) {
-               return PROTOCOL_LATEST;
-       }
-       return client_max_protocol;
-}
-
 int lp_client_ipc_min_protocol(void)
 {
        int client_ipc_min_protocol = lp__client_ipc_min_protocol();
@@ -4475,11 +4466,7 @@ int lp_client_ipc_signing(void)
 {
        int client_ipc_signing = lp__client_ipc_signing();
        if (client_ipc_signing == SMB_SIGNING_DEFAULT) {
-               int ipc_min_protocol = lp_client_ipc_min_protocol();
-               if (ipc_min_protocol >= PROTOCOL_SMB2_02) {
-                       return SMB_SIGNING_REQUIRED;
-               }
-               return lp_client_signing();
+               return SMB_SIGNING_REQUIRED;
        }
        return client_ipc_signing;
 }