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:13 +0200 |
| commit | ba2cb35ca5b335a8f33e012255b43b9cf9a04ecf (patch) | |
| tree | dba99b6d1db02c165d12ad5bb54c4d0315cc1f85 /source3/utils/net_rpc_join.c | |
| parent | 44bdc98823bd85597803f1ca8f5d0282f2d724b3 (diff) | |
| download | samba-ba2cb35ca5b335a8f33e012255b43b9cf9a04ecf.tar.gz | |
Refactoring: Change calling conventions for cli_rpc_pipe_open_schannel_with_key
Pass in ndr_syntax_id instead of pipe_idx, return NTSTATUS
(This used to be commit 78e9c937ff2d2e1b70cfed4121e17feb6efafda1)
Diffstat (limited to 'source3/utils/net_rpc_join.c')
| -rw-r--r-- | source3/utils/net_rpc_join.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c index 2599c28e9c8..f63cb14b7e2 100644 --- a/source3/utils/net_rpc_join.c +++ b/source3/utils/net_rpc_join.c @@ -99,11 +99,11 @@ NTSTATUS net_rpc_join_ok(struct net_context *c, const char *domain, return ntret; } - pipe_hnd = cli_rpc_pipe_open_schannel_with_key(cli, PI_NETLOGON, - PIPE_AUTH_LEVEL_PRIVACY, - domain, netlogon_pipe->dc, &ntret); + ntret = cli_rpc_pipe_open_schannel_with_key( + cli, &ndr_table_netlogon.syntax_id, PIPE_AUTH_LEVEL_PRIVACY, + domain, netlogon_pipe->dc, &pipe_hnd); - if (!pipe_hnd) { + if (!NT_STATUS_IS_OK(ntret)) { DEBUG(0,("net_rpc_join_ok: failed to open schannel session " "on netlogon pipe to server %s for domain %s. Error was %s\n", cli->desthost, domain, nt_errstr(ntret) )); @@ -413,13 +413,12 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv) do the same again (setup creds) in net_rpc_join_ok(). JRA. */ if (lp_client_schannel() && (neg_flags & NETLOGON_NEG_SCHANNEL)) { - struct rpc_pipe_client *netlogon_schannel_pipe = - cli_rpc_pipe_open_schannel_with_key(cli, - PI_NETLOGON, - PIPE_AUTH_LEVEL_PRIVACY, - domain, - pipe_hnd->dc, - &result); + struct rpc_pipe_client *netlogon_schannel_pipe; + + result = cli_rpc_pipe_open_schannel_with_key( + cli, &ndr_table_netlogon.syntax_id, + PIPE_AUTH_LEVEL_PRIVACY, domain, pipe_hnd->dc, + &netlogon_schannel_pipe); if (!NT_STATUS_IS_OK(result)) { DEBUG(0, ("Error in domain join verification (schannel setup failed): %s\n\n", |