[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1003-gfb0f49c

[Jeremy Allison]

The branch, v3-4-test has been updated
       via  fb0f49ce0d10a8c84730156f3f04fe48ee65e8e7 (commit)
      from  74f805fbb654b58372b0c86f3314abfd9c76dbbe (commit)

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


- Log -----------------------------------------------------------------
commit fb0f49ce0d10a8c84730156f3f04fe48ee65e8e7
Author: Ole Hansen <ole at redvw.com>
Date:   Fri May 15 16:13:59 2009 -0700

    Fix bug #6359 - smbclient -L does not list workgroup for hosts with both IPv4 and IPv6 addresses

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

Summary of changes:
 source3/client/client.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/client.c b/source3/client/client.c
index a6f31bc..1b1fc8a 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -4561,10 +4561,16 @@ static int do_host_query(const char *query_host)
 
 	browse_host(true);
 
-	if (interpret_string_addr(&ss, query_host, 0) && (ss.ss_family != AF_INET)) {
-		d_printf("%s is an IPv6 address -- no workgroup available\n",
-			query_host);
-		return 1;
+	/* Ensure that the host can do IPv4 */
+
+	if (!interpret_addr(query_host)) {
+		struct sockaddr_storage ss;
+		if (interpret_string_addr(&ss, query_host, 0) &&
+				(ss.ss_family != AF_INET)) {
+			d_printf("%s is an IPv6 address -- no workgroup available\n",
+				query_host);
+			return 1;
+		}
 	}
 
 	if (port != 139) {


-- 
Samba Shared Repository