diff options
| author | bubulle <bubulle@alioth.debian.org> | 2008-11-01 11:09:46 +0000 |
|---|---|---|
| committer | bubulle <bubulle@alioth.debian.org> | 2008-11-01 11:09:46 +0000 |
| commit | a2b71a0141763c20552bb45eeb4cb78c4b513118 (patch) | |
| tree | 85b64d98387145ea4e00c1b529e1820542a979a3 /source/libsmb/libsmb_dir.c | |
| parent | 2203bd59918d6d70515f9dad601cb5c0ef098092 (diff) | |
| download | samba-a2b71a0141763c20552bb45eeb4cb78c4b513118.tar.gz | |
Revert the merge of 3.3.0~pre2 in upstream branch
git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@2200 fc4039ab-9d04-0410-8cac-899223bdd6b0
Diffstat (limited to 'source/libsmb/libsmb_dir.c')
| -rw-r--r-- | source/libsmb/libsmb_dir.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/libsmb/libsmb_dir.c b/source/libsmb/libsmb_dir.c index aa313f2c05..f836989004 100644 --- a/source/libsmb/libsmb_dir.c +++ b/source/libsmb/libsmb_dir.c @@ -273,9 +273,8 @@ net_share_enum_rpc(struct cli_state *cli, uint32_t total_entries = 0; /* Open the server service pipe */ - nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_srvsvc.syntax_id, - &pipe_hnd); - if (!NT_STATUS_IS_OK(nt_status)) { + pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_SRVSVC, &nt_status); + if (!pipe_hnd) { DEBUG(1, ("net_share_enum_rpc pipe open fail!\n")); return -1; } @@ -288,7 +287,7 @@ net_share_enum_rpc(struct cli_state *cli, /* Issue the NetShareEnum RPC call and retrieve the response */ nt_status = rpccli_srvsvc_NetShareEnumAll(pipe_hnd, talloc_tos(), - pipe_hnd->desthost, + pipe_hnd->cli->desthost, &info_ctr, preferred_len, &total_entries, @@ -320,7 +319,7 @@ net_share_enum_rpc(struct cli_state *cli, done: /* Close the server service pipe */ - TALLOC_FREE(pipe_hnd); + cli_rpc_pipe_close(pipe_hnd); /* Tell 'em if it worked */ return W_ERROR_IS_OK(result) ? 0 : -1; |