diff options
| author | Volker Lendecke <vl@samba.org> | 2008-07-20 11:04:31 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-07-20 17:37:11 +0200 |
| commit | 1335da2a7cc639310e5d389e8e8dbe67c4e7ca25 (patch) | |
| tree | ccc12b50a8eb04039345c082168c9cc823696b05 /source3/rpcclient/rpcclient.c | |
| parent | 18fb7e09776e26dacfa2329607f8a20699ad2969 (diff) | |
| download | samba-1335da2a7cc639310e5d389e8e8dbe67c4e7ca25.tar.gz samba-1335da2a7cc639310e5d389e8e8dbe67c4e7ca25.tar.bz2 samba-1335da2a7cc639310e5d389e8e8dbe67c4e7ca25.zip | |
Refactoring: Change calling conventions for cli_rpc_pipe_open_noauth
Pass in ndr_syntax_id instead of pipe_idx, return NTSTATUS
(This used to be commit 9abc9dc4dc13bd3e42f98eff64eacf24b51f5779)
Diffstat (limited to 'source3/rpcclient/rpcclient.c')
| -rw-r--r-- | source3/rpcclient/rpcclient.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index 35ff14ef2d..ff98a24fba 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -145,7 +145,9 @@ static void fetch_machine_sid(struct cli_state *cli) goto error; } - if ((lsapipe = cli_rpc_pipe_open_noauth(cli, PI_LSARPC, &result)) == NULL) { + result = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id, + &lsapipe); + if (!NT_STATUS_IS_OK(result)) { fprintf(stderr, "could not initialise lsa pipe. Error was %s\n", nt_errstr(result) ); goto error; } @@ -578,9 +580,10 @@ static NTSTATUS do_cmd(struct cli_state *cli, if (cmd_entry->pipe_idx != -1 && cmd_entry->rpc_pipe == NULL) { switch (pipe_default_auth_type) { case PIPE_AUTH_TYPE_NONE: - cmd_entry->rpc_pipe = cli_rpc_pipe_open_noauth(cli, - cmd_entry->pipe_idx, - &ntresult); + ntresult = cli_rpc_pipe_open_noauth( + cli, + cli_get_iface(cmd_entry->pipe_idx), + &cmd_entry->rpc_pipe); break; case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP: cmd_entry->rpc_pipe = cli_rpc_pipe_open_spnego_ntlmssp(cli, @@ -613,7 +616,7 @@ static NTSTATUS do_cmd(struct cli_state *cli, pipe_default_auth_type )); return NT_STATUS_UNSUCCESSFUL; } - if (!cmd_entry->rpc_pipe) { + if (!NT_STATUS_IS_OK(ntresult)) { DEBUG(0, ("Could not initialise %s. Error was %s\n", cli_get_pipe_name(cmd_entry->pipe_idx), nt_errstr(ntresult) )); |