[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2298-gb261f06

Günther Deschner gd at samba.org
Tue May 6 07:42:18 GMT 2008


The branch, v3-3-test has been updated
       via  b261f063125f8454d8f4e8f6b6f8aa5bc393ea34 (commit)
       via  ce1556d0fb993b78f02ac4cc4f8a45ab7a0b5397 (commit)
      from  bb8f098cdfd902bbb36426df2c4f8532881b3fcd (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit b261f063125f8454d8f4e8f6b6f8aa5bc393ea34
Author: Günther Deschner <gd at samba.org>
Date:   Mon May 5 18:04:41 2008 +0200

    mailslot/cldap: use nt_version bits in queries.
    
    Guenther

commit ce1556d0fb993b78f02ac4cc4f8a45ab7a0b5397
Author: Günther Deschner <gd at samba.org>
Date:   Mon May 5 17:22:49 2008 +0200

    dsgetdcname: use correct dc name for name cache store.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/libads/cldap.c         |    3 ++-
 source/libsmb/dsgetdcname.c   |    7 +++++--
 source/winbindd/winbindd_cm.c |    4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libads/cldap.c b/source/libads/cldap.c
index be084c9..8b23ff9 100644
--- a/source/libads/cldap.c
+++ b/source/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/source/libsmb/dsgetdcname.c b/source/libsmb/dsgetdcname.c
index fbc3bda..1bd54d8 100644
--- a/source/libsmb/dsgetdcname.c
+++ b/source/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);
@@ -830,7 +833,7 @@ static NTSTATUS process_dc_netbios(TALLOC_CTX *mem_ctx,
 		{
 			dc_hostname = tmp_dc_name;
 			dc_domain_name = talloc_strdup_upper(mem_ctx, domain_name);
-			namecache_store(dc_name, NBT_NAME_SERVER, 1, &ip_list);
+			namecache_store(tmp_dc_name, NBT_NAME_SERVER, 1, &ip_list);
 			goto make_reply;
 		}
 	}
diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c
index d27f3e4..80f6bfa 100644
--- a/source/winbindd/winbindd_cm.c
+++ b/source/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);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list