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

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  314202e... Fix bug 7627 - smbclient ignores "-I" when used with "-L", fails name resolution.
      from  ee9a43c... s3:winbindd: fix error handling in wb_next_grent_fetch_done()

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


- Log -----------------------------------------------------------------
commit 314202e1c8b63bc89d565eec845558ddf7b1aad9
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Aug 20 15:57:08 2010 -0700

    Fix bug 7627 - smbclient ignores "-I" when used with "-L", fails name resolution.
    
    Still needs some more work to fix missing netbios name issues, but fixes
    underlying issue of IP address being ignored.
    
    Jeremy.
    (cherry picked from commit af081ec4a101aa5d0babfd913e40f5f8ed1b0fe9)

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

Summary of changes:
 source3/client/client.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/client.c b/source3/client/client.c
index b0c931c..6e5e430 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -4661,7 +4661,7 @@ static int process(const char *base_directory)
 static int do_host_query(const char *query_host)
 {
 	cli = cli_cm_open(talloc_tos(), NULL,
-			query_host, "IPC$", auth_info, true, smb_encrypt,
+			have_ip ? dest_ss_str : query_host, "IPC$", auth_info, true, smb_encrypt,
 			max_protocol, port, name_type);
 	if (!cli)
 		return 1;
@@ -4687,7 +4687,8 @@ static int do_host_query(const char *query_host)
 
 		cli_shutdown(cli);
 		cli = cli_cm_open(talloc_tos(), NULL,
-				query_host, "IPC$", auth_info, true, smb_encrypt,
+				have_ip ? dest_ss_str : query_host, "IPC$",
+				auth_info, true, smb_encrypt,
 				max_protocol, 139, name_type);
 	}
 


-- 
Samba Shared Repository