[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-977-gd665cec

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  d665cecd8b1b40ad30ec435de0bd925cdea24795 (commit)
       via  c003e66ff10b23bb30aef0071ba7a3ae9579174e (commit)
      from  7c2e735df3d8a4105a4944411d111fc66c13b01f (commit)

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


- Log -----------------------------------------------------------------
commit d665cecd8b1b40ad30ec435de0bd925cdea24795
Merge: c003e66ff10b23bb30aef0071ba7a3ae9579174e 7c2e735df3d8a4105a4944411d111fc66c13b01f
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Apr 17 09:25:45 2008 -0700

    Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

commit c003e66ff10b23bb30aef0071ba7a3ae9579174e
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Apr 17 09:24:54 2008 -0700

    Fix the problem when -L is used with IPv6 addresses. Don't try to
    connect on port 139 with IPv6. Found by David Holder @ Erion.
    Karolin please merge to 3.2-stable.
    Jeremy.

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

Summary of changes:
 source/client/client.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/client.c b/source/client/client.c
index 882ed4d..276ffb9 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -4514,6 +4514,8 @@ static int process(const char *base_directory)
 
 static int do_host_query(const char *query_host)
 {
+	struct sockaddr_storage ss;
+
 	cli = cli_cm_open(talloc_tos(), NULL,
 			query_host, "IPC$", true, smb_encrypt);
 	if (!cli)
@@ -4521,6 +4523,12 @@ 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;
+	}
+
 	if (port != 139) {
 
 		/* Workgroups simply don't make sense over anything


-- 
Samba Shared Repository