[SCM] Samba Shared Repository - branch v3-2-test updated

[Günther Deschner]

The branch, v3-2-test has been updated
       via  4dfda879a3ad44be7008702b9fbefe3858436118 (commit)
      from  4f084efd6ac39a8347d5cfc73b727940e40150cf (commit)

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

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4dfda879a3ad44be7008702b9fbefe3858436118
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 12 11:37:03 2007 +0200

    Fix the build WITH_DNS_UPDATES.
    Jeremy, please have a look.
    
    Guenther

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

Summary of changes:
 source/utils/net_dns.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/net_dns.c b/source/utils/net_dns.c
index 716192b..8b82a96 100644
--- a/source/utils/net_dns.c
+++ b/source/utils/net_dns.c
@@ -157,8 +157,14 @@ int get_my_ip_address( struct in_addr **ips )
 	}
 
 	for ( i=0; i<n; i++ ) {
-		if (!is_loopback_ip_v4(nics[i].iface_addr.ip.s_addr)) {
-			memcpy( &list[count++], &nics[i].iface_addr.ip, sizeof( struct in_addr ) );
+		if ((nics[i].ip.ss_family == AF_INET)) {
+			struct in_addr ifip;
+
+			ifip = ((const struct sockaddr_in *)&nics[i].ip)->sin_addr;
+
+			if (!is_loopback_ip_v4(ifip)) {
+				memcpy(&list[count++], &ifip, sizeof(struct in_addr));
+			}
 		}
 	}
 	*ips = list;


-- 
Samba Shared Repository