summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-03-10 04:33:06 +0100
committerGünther Deschner <gd@samba.org>2008-03-10 04:33:06 +0100
commit251a16c9004bcd48107518694fef3494131fe850 (patch)
tree36a2a94b43a29d3dc1097c26aeebbf3fc9738811
parent032d4fa8ea3c5df2607e70eee1f13d51be460196 (diff)
downloadsamba-251a16c9004bcd48107518694fef3494131fe850.tar.gz
samba-251a16c9004bcd48107518694fef3494131fe850.tar.bz2
samba-251a16c9004bcd48107518694fef3494131fe850.zip
Use rpccli_srvsvc_NetShareEnumAll in smbclient.
Guenther (This used to be commit 1121633652ffb77dce8df9cc91b7dfc2d55fd348)
-rw-r--r--source3/client/client.c36
1 files changed, 21 insertions, 15 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index 67060cb574..b0b3e8e19b 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -3627,13 +3627,13 @@ static bool browse_host_rpc(bool sort)
NTSTATUS status;
struct rpc_pipe_client *pipe_hnd;
TALLOC_CTX *frame = talloc_stackframe();
- ENUM_HND enum_hnd;
WERROR werr;
- SRV_SHARE_INFO_CTR ctr;
+ struct srvsvc_NetShareInfoCtr info_ctr;
+ struct srvsvc_NetShareCtr1 ctr1;
+ uint32_t resume_handle = 0;
+ uint32_t total_entries = 0;
int i;
- init_enum_hnd(&enum_hnd, 0);
-
pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_SRVSVC, &status);
if (pipe_hnd == NULL) {
@@ -3643,23 +3643,29 @@ static bool browse_host_rpc(bool sort)
return false;
}
- werr = rpccli_srvsvc_net_share_enum(pipe_hnd, frame, 1, &ctr,
- 0xffffffff, &enum_hnd);
+ ZERO_STRUCT(info_ctr);
+ ZERO_STRUCT(ctr1);
+
+ info_ctr.level = 1;
+ info_ctr.ctr.ctr1 = &ctr1;
+
+ status = rpccli_srvsvc_NetShareEnumAll(pipe_hnd, frame,
+ pipe_hnd->cli->desthost,
+ &info_ctr,
+ 0xffffffff,
+ &total_entries,
+ &resume_handle,
+ &werr);
- if (!W_ERROR_IS_OK(werr)) {
+ if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(werr)) {
cli_rpc_pipe_close(pipe_hnd);
TALLOC_FREE(frame);
return false;
}
- for (i=0; i<ctr.num_entries; i++) {
- SRV_SHARE_INFO_1 *info = &ctr.share.info1[i];
- char *name, *comment;
- name = rpcstr_pull_unistr2_talloc(
- frame, &info->info_1_str.uni_netname);
- comment = rpcstr_pull_unistr2_talloc(
- frame, &info->info_1_str.uni_remark);
- browse_fn(name, info->info_1.type, comment, NULL);
+ for (i=0; i < info_ctr.ctr.ctr1->count; i++) {
+ struct srvsvc_NetShareInfo1 info = info_ctr.ctr.ctr1->array[i];
+ browse_fn(info.name, info.type, info.comment, NULL);
}
cli_rpc_pipe_close(pipe_hnd);