diff options
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/libsmb_dir.c | 5 | ||||
| -rw-r--r-- | source3/libsmb/libsmb_server.c | 7 | ||||
| -rw-r--r-- | source3/libsmb/passchange.c | 10 | ||||
| -rw-r--r-- | source3/libsmb/trusts_util.c | 5 |
4 files changed, 15 insertions, 12 deletions
diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c index aea4f103b6..aa313f2c05 100644 --- a/source3/libsmb/libsmb_dir.c +++ b/source3/libsmb/libsmb_dir.c @@ -273,8 +273,9 @@ net_share_enum_rpc(struct cli_state *cli, uint32_t total_entries = 0; /* Open the server service pipe */ - pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_SRVSVC, &nt_status); - if (!pipe_hnd) { + nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_srvsvc.syntax_id, + &pipe_hnd); + if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(1, ("net_share_enum_rpc pipe open fail!\n")); return -1; } diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c index 7af5ca3a24..0a3287bc82 100644 --- a/source3/libsmb/libsmb_server.c +++ b/source3/libsmb/libsmb_server.c @@ -646,10 +646,9 @@ SMBC_attr_server(TALLOC_CTX *ctx, ZERO_STRUCTP(ipc_srv); ipc_srv->cli = ipc_cli; - pipe_hnd = cli_rpc_pipe_open_noauth(ipc_srv->cli, - PI_LSARPC, - &nt_status); - if (!pipe_hnd) { + nt_status = cli_rpc_pipe_open_noauth( + ipc_srv->cli, &ndr_table_lsarpc.syntax_id, &pipe_hnd); + if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(1, ("cli_nt_session_open fail!\n")); errno = ENOTSUP; cli_shutdown(ipc_srv->cli); diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c index 3b82e5767f..86c7b52160 100644 --- a/source3/libsmb/passchange.c +++ b/source3/libsmb/passchange.c @@ -152,10 +152,11 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam * will just fail. So we do it anonymously, there's no other * way. */ - pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_SAMR, &result); + result = cli_rpc_pipe_open_noauth( + cli, &ndr_table_samr.syntax_id, &pipe_hnd); } - if (!pipe_hnd) { + if (!NT_STATUS_IS_OK(result)) { if (lp_client_lanman_auth()) { /* Use the old RAP method. */ if (!cli_oem_change_password(cli, user_name, new_passwd, old_passwd)) { @@ -204,9 +205,10 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam result = NT_STATUS_UNSUCCESSFUL; /* OK, this is ugly, but... try an anonymous pipe. */ - pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_SAMR, &result); + result = cli_rpc_pipe_open_noauth(cli, &ndr_table_samr.syntax_id, + &pipe_hnd); - if ( pipe_hnd && + if ( NT_STATUS_IS_OK(result) && (NT_STATUS_IS_OK(result = rpccli_samr_chgpasswd_user2( pipe_hnd, talloc_tos(), user_name, new_passwd, old_passwd)))) { diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c index 6b3bbaf1d8..f4fdf9eb6f 100644 --- a/source3/libsmb/trusts_util.c +++ b/source3/libsmb/trusts_util.c @@ -201,8 +201,9 @@ bool enumerate_domain_trusts( TALLOC_CTX *mem_ctx, const char *domain, /* open the LSARPC_PIPE */ - lsa_pipe = cli_rpc_pipe_open_noauth( cli, PI_LSARPC, &result ); - if ( !lsa_pipe) { + result = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id, + &lsa_pipe); + if (!NT_STATUS_IS_OK(result)) { goto done; } |