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 | e0be03d8d5006f92ed479b84cd30ebfe510fa68a (patch) | |
| tree | 4e0571cc682b35db841407eb77983a40459167bc /source3/winbindd/winbindd_cm.c | |
| parent | 1335da2a7cc639310e5d389e8e8dbe67c4e7ca25 (diff) | |
| download | samba-e0be03d8d5006f92ed479b84cd30ebfe510fa68a.tar.gz samba-e0be03d8d5006f92ed479b84cd30ebfe510fa68a.tar.bz2 samba-e0be03d8d5006f92ed479b84cd30ebfe510fa68a.zip | |
Refactoring: Change calling conventions for cli_rpc_pipe_open_ntlmssp
Pass in ndr_syntax_id instead of pipe_idx, return NTSTATUS
(This used to be commit a13f0599551609394904b99e4014d580ec65c506)
Diffstat (limited to 'source3/winbindd/winbindd_cm.c')
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index b7e2f086fc..340dc2381d 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -1962,14 +1962,15 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, /* We have an authenticated connection. Use a NTLMSSP SPNEGO authenticated SAMR pipe with sign & seal. */ - conn->samr_pipe = - cli_rpc_pipe_open_spnego_ntlmssp(conn->cli, PI_SAMR, - PIPE_AUTH_LEVEL_PRIVACY, - domain_name, - machine_account, - machine_password, &result); + result = cli_rpc_pipe_open_spnego_ntlmssp(conn->cli, + &ndr_table_samr.syntax_id, + PIPE_AUTH_LEVEL_PRIVACY, + domain_name, + machine_account, + machine_password, + &conn->samr_pipe); - if (conn->samr_pipe == NULL) { + if (!NT_STATUS_IS_OK(result)) { DEBUG(10,("cm_connect_sam: failed to connect to SAMR " "pipe for domain %s using NTLMSSP " "authenticated pipe: user %s\\%s. Error was " @@ -2102,11 +2103,13 @@ NTSTATUS cm_connect_lsa(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, /* We have an authenticated connection. Use a NTLMSSP SPNEGO * authenticated LSA pipe with sign & seal. */ - conn->lsa_pipe = cli_rpc_pipe_open_spnego_ntlmssp - (conn->cli, PI_LSARPC, PIPE_AUTH_LEVEL_PRIVACY, - conn->cli->domain, conn->cli->user_name, conn_pwd, &result); + result = cli_rpc_pipe_open_spnego_ntlmssp + (conn->cli, &ndr_table_lsarpc.syntax_id, + PIPE_AUTH_LEVEL_PRIVACY, + conn->cli->domain, conn->cli->user_name, conn_pwd, + &conn->lsa_pipe); - if (conn->lsa_pipe == NULL) { + if (!NT_STATUS_IS_OK(result)) { DEBUG(10,("cm_connect_lsa: failed to connect to LSA pipe for " "domain %s using NTLMSSP authenticated pipe: user " "%s\\%s. Error was %s. Trying schannel.\n", |