[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1652-gad7dca4

Jeremy Allison jra at samba.org
Fri May 15 23:14:58 GMT 2009


The branch, master has been updated
       via  ad7dca471adc3a9c199bc651e9e3476150f1af28 (commit)
      from  f5c96e54c633717ffe1a967f4ab9fdede31fa749 (commit)

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


- Log -----------------------------------------------------------------
commit ad7dca471adc3a9c199bc651e9e3476150f1af28
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 9c53472..3795472 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -4563,10 +4563,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


More information about the samba-cvs mailing list