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

[Michael Adam]

The branch, v3-2-test has been updated
       via  4a0d1ad601facf158db0c1d1c320e9e1369093d0 (commit)
      from  376de8a0e4194e186b460911e3319b0f4448203e (commit)

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


- Log -----------------------------------------------------------------
commit 4a0d1ad601facf158db0c1d1c320e9e1369093d0
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 27 10:06:53 2008 +0100

    Fix caller of node_status_query() to use sockaddr_storage().
    
    Caller is hidden inside an #ifdef .
    
    Michael

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

Summary of changes:
 source/nsswitch/wins.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/wins.c b/source/nsswitch/wins.c
index c822fc7..35649df 100644
--- a/source/nsswitch/wins.c
+++ b/source/nsswitch/wins.c
@@ -147,7 +147,7 @@ static struct in_addr *lookup_byname_backend(const char *name, int *count)
 static NODE_STATUS_STRUCT *lookup_byaddr_backend(char *addr, int *count)
 {
 	int fd;
-	struct in_addr  ip;
+	struct sockaddr_storage ss;
 	struct nmb_name nname;
 	NODE_STATUS_STRUCT *status;
 
@@ -160,8 +160,10 @@ static NODE_STATUS_STRUCT *lookup_byaddr_backend(char *addr, int *count)
 		return NULL;
 
 	make_nmb_name(&nname, "*", 0);
-	(void)interpret_addr2(&ip,addr);
-	status = node_status_query(fd,&nname,ip, count, NULL);
+	if (!interpret_string_addr(&ss, addr, AI_NUMERICHOST)) {
+		return NULL;
+	}
+	status = node_status_query(fd, &nname, &ss, count, NULL);
 
 	close(fd);
 	return status;


-- 
Samba Shared Repository