summaryrefslogtreecommitdiff
path: root/source3/rpc_client/cli_netlogon.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-10-27 18:06:29 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:05:13 -0500
commitca551d55a894dc88c9374eb1ca0ce4b4005a22a2 (patch)
tree637545179cc25785a8d5273adb7660954c5bf7ab /source3/rpc_client/cli_netlogon.c
parente1ffd2d612184fb1343cbe7e1d5d1aacebe0e8fa (diff)
downloadsamba-ca551d55a894dc88c9374eb1ca0ce4b4005a22a2.tar.gz
samba-ca551d55a894dc88c9374eb1ca0ce4b4005a22a2.tar.bz2
samba-ca551d55a894dc88c9374eb1ca0ce4b4005a22a2.zip
r11336: Start to get my control back :-). Volker, I think
Andrew Bartlett is right - making lsa code do it the netlogon way, not vica-versa. Jeremy. (This used to be commit f313757e36215cb3dd956e4a73de6d30258a6974)
Diffstat (limited to 'source3/rpc_client/cli_netlogon.c')
-rw-r--r--source3/rpc_client/cli_netlogon.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 015b28c16f..78e682d12a 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -259,7 +259,7 @@ NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli,
uint32 sec_chan_type,
uint32 *neg_flags_inout)
{
- NTSTATUS result;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
DOM_CHAL clnt_chal_send;
DOM_CHAL srv_chal_recv;
struct dcinfo *dc;
@@ -405,7 +405,9 @@ NTSTATUS rpccli_netlogon_getdcname(struct rpc_pipe_client *cli,
net_io_r_getdcname,
NT_STATUS_UNSUCCESSFUL);
- if (NT_STATUS_IS_OK(result = r.status)) {
+ result = r.status;
+
+ if (NT_STATUS_IS_OK(result)) {
rpcstr_pull_unistr2_fstring(newdcname, &r.uni_dcname);
}