mailslot/cldap: use nt_version bits in queries.

Guenther
(This used to be commit b261f063125f8454d8f4e8f6b6f8aa5bc393ea34)

diff --git a/source3/libads/cldap.c b/source3/libads/cldap.c
index be084c9df6031d506ddf4161d53efbda6b3bd81b..8b23ff90229e04cc178abafa8b0b761572e8b812 100644 (file)
--- a/source3/libads/cldap.c
+++ b/source3/libads/cldap.c
@@ -217,6 +217,7 @@ bool ads_cldap_netlogon(TALLOC_CTX *mem_ctx,
 {
        int sock;
        int ret;
+       uint32_t nt_version = NETLOGON_VERSION_5 | NETLOGON_VERSION_5EX;
 
        sock = open_udp_socket(server, LDAP_PORT );
        if (sock == -1) {
@@ -225,7 +226,7 @@ bool ads_cldap_netlogon(TALLOC_CTX *mem_ctx,
                return False;
        }
 
-       ret = send_cldap_netlogon(sock, realm, global_myname(), 6);
+       ret = send_cldap_netlogon(sock, realm, global_myname(), nt_version);
        if (ret != 0) {
                close(sock);
                return False;

diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index de647ad8bf5888d1a5feb1936e51d42d9b339d5a..1bd54d80e6eba6ecd056ef424c44f13fff08ef52 100644 (file)
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -784,6 +784,9 @@ static NTSTATUS process_dc_netbios(TALLOC_CTX *mem_ctx,
        fstring tmp_dc_name;
        struct messaging_context *msg_ctx = msg_context(mem_ctx);
        struct nbt_ntlogon_packet *reply = NULL;
+       uint32_t nt_version = NETLOGON_VERSION_1 |
+                             NETLOGON_VERSION_5 |
+                             NETLOGON_VERSION_5EX_WITH_IP;
 
        if (flags & DS_PDC_REQUIRED) {
                name_type = NBT_NAME_PDC;
@@ -802,7 +805,7 @@ static NTSTATUS process_dc_netbios(TALLOC_CTX *mem_ctx,
 
                if (send_getdc_request(mem_ctx, msg_ctx,
                                       &dclist[i].ss, domain_name,
-                                      NULL, 11))
+                                      NULL, nt_version))
                {
                        int k;
                        smb_msleep(100);

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index d27f3e47f58d6f59917a995b7b12686f4a6d7120..80f6bfaab3063d8ed646ce8d4c0c82018d29f9cf 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1030,6 +1030,7 @@ static bool dcip_to_name(TALLOC_CTX *mem_ctx,
                fstring name )
 {
        struct ip_service ip_list;
+       uint32_t nt_version = NETLOGON_VERSION_1;
 
        ip_list.ss = *pss;
        ip_list.port = 0;
@@ -1093,7 +1094,8 @@ static bool dcip_to_name(TALLOC_CTX *mem_ctx,
        /* try GETDC requests next */
 
        if (send_getdc_request(mem_ctx, winbind_messaging_context(),
-                              pss, domain->name, &domain->sid, 1)) {
+                              pss, domain->name, &domain->sid,
+                              nt_version)) {
                const char *dc_name = NULL;
                int i;
                smb_msleep(100);