summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-04-30 17:10:35 +0200
committerVolker Lendecke <vlendec@samba.org>2011-04-30 18:16:28 +0200
commit020b691cf842f30ff42474c2b0102751b5fa17ac (patch)
tree71f8779dfc1e4d7e5f52526747d0c3e58e4acb6a /source3/libsmb
parentda2e34a134545113c19056e4b20b457676ac0215 (diff)
downloadsamba-020b691cf842f30ff42474c2b0102751b5fa17ac.tar.gz
samba-020b691cf842f30ff42474c2b0102751b5fa17ac.tar.bz2
samba-020b691cf842f30ff42474c2b0102751b5fa17ac.zip
s3: Remove ip_sevice from get_ipc_connect_master_ip
Autobuild-User: Volker Lendecke <vlendec@samba.org> Autobuild-Date: Sat Apr 30 18:16:28 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/cliconnect.c10
-rw-r--r--source3/libsmb/libsmb_dir.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 6d1eaadeb0..cb7b7d1bbd 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -3414,7 +3414,7 @@ struct cli_state *get_ipc_connect(char *server,
*/
struct cli_state *get_ipc_connect_master_ip(TALLOC_CTX *ctx,
- struct ip_service *mb_ip,
+ struct sockaddr_storage *mb_ip,
const struct user_auth_info *user_info,
char **pp_workgroup_out)
{
@@ -3425,7 +3425,7 @@ struct cli_state *get_ipc_connect_master_ip(TALLOC_CTX *ctx,
*pp_workgroup_out = NULL;
- print_sockaddr(addr, sizeof(addr), &mb_ip->ss);
+ print_sockaddr(addr, sizeof(addr), mb_ip);
DEBUG(99, ("Looking up name of master browser %s\n",
addr));
@@ -3440,8 +3440,8 @@ struct cli_state *get_ipc_connect_master_ip(TALLOC_CTX *ctx,
* the original wildcard query as the first choice and fall back to
* MSBROWSE if the wildcard query fails.
*/
- if (!name_status_find("*", 0, 0x1d, &mb_ip->ss, name) &&
- !name_status_find(MSBROWSE, 1, 0x1d, &mb_ip->ss, name)) {
+ if (!name_status_find("*", 0, 0x1d, mb_ip, name) &&
+ !name_status_find(MSBROWSE, 1, 0x1d, mb_ip, name)) {
DEBUG(99, ("Could not retrieve name status for %s\n",
addr));
@@ -3493,7 +3493,7 @@ struct cli_state *get_ipc_connect_master_ip_bcast(TALLOC_CTX *ctx,
print_sockaddr(addr, sizeof(addr), &ip_list[i].ss);
DEBUG(99, ("Found master browser %s\n", addr));
- cli = get_ipc_connect_master_ip(ctx, &ip_list[i],
+ cli = get_ipc_connect_master_ip(ctx, &ip_list[i].ss,
user_info, pp_workgroup_out);
if (cli)
return(cli);
diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index 3d50107f60..b0f3c904b4 100644
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -540,7 +540,7 @@ SMBC_opendir_ctx(SMBCCTX *context,
addr));
cli = get_ipc_connect_master_ip(talloc_tos(),
- &ip_list[i],
+ &ip_list[i].ss,
&u_info,
&wg_ptr);
/* cli == NULL is the master browser refused to talk or