[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  14c05cf s4:libcli/resolve: only try broadcast messages to ipv4 addresses
      from  1210b8a dns: Do as BIND and MS DNS and drop quries with qdcount != 1

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 14c05cf93ad1a6087fe4751e1057a7c0c0e91c2c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Sep 28 02:02:08 2011 +0200

    s4:libcli/resolve: only try broadcast messages to ipv4 addresses
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Wed Sep 28 05:10:53 CEST 2011 on sn-devel-104

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

Summary of changes:
 source4/libcli/resolve/bcast.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libcli/resolve/bcast.c b/source4/libcli/resolve/bcast.c
index 150705f..787d048 100644
--- a/source4/libcli/resolve/bcast.c
+++ b/source4/libcli/resolve/bcast.c
@@ -53,8 +53,18 @@ struct composite_context *resolve_name_bcast_send(TALLOC_CTX *mem_ctx,
 	if (address_list == NULL) return NULL;
 
 	for (i=0;i<num_interfaces;i++) {
-		const char *bcast = iface_list_n_bcast(data->ifaces, i);
-		if (bcast == NULL) continue;
+		bool ipv4 = iface_list_n_is_v4(data->ifaces, i);
+		const char *bcast;
+
+		if (!ipv4) {
+			continue;
+		}
+
+		bcast = iface_list_n_bcast(data->ifaces, i);
+		if (bcast == NULL) {
+			continue;
+		}
+
 		address_list[count] = talloc_strdup(address_list, bcast);
 		if (address_list[count] == NULL) {
 			talloc_free(address_list);


-- 
Samba Shared Repository