CVE-2016-2115: s3:winbindd: use lp_client_ipc_{min,max}_protocol()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11756

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/include/proto.h b/source3/include/proto.h
index f6052026529317b9681cbaee0f2636b22db6cde6..be900246da4c7473fd652728bcbb8c23267c91f0 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -944,7 +944,6 @@ const char *lp_idmap_backend(const char *domain_name);
 const char *lp_idmap_default_backend (void);
 int lp_security(void);
 int lp_client_max_protocol(void);
-int lp_winbindd_max_protocol(void);
 int lp_client_ipc_min_protocol(void);
 int lp_client_ipc_max_protocol(void);
 int lp_client_ipc_signing(void);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 1767488134abcb6d793cfe257698befa43d8b648..09dc217315e7f8aa91fb14f92389bf7fbb363c06 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4334,15 +4334,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();

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index cbce0c40c064024c80fe0b8416d42317d429e2f6..e0e905d55628e8a8b569942e3b480a014ec75422 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -935,8 +935,8 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
        cli_set_timeout(*cli, 10000); /* 10 seconds */
 
        result = smbXcli_negprot((*cli)->conn, (*cli)->timeout,
-                                lp_client_min_protocol(),
-                                lp_winbindd_max_protocol());
+                                lp_client_ipc_min_protocol(),
+                                lp_client_ipc_max_protocol());
 
        if (!NT_STATUS_IS_OK(result)) {
                DEBUG(1, ("cli_negprot failed: %s\n", nt_errstr(result)));