summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-07-20 16:33:26 +0200
committerVolker Lendecke <vl@samba.org>2008-07-20 17:37:12 +0200
commitb8fc15be950072846d23e3836d4d0289c10156f2 (patch)
tree23d17fd53297e37faafc025015f036585abcda3c /source3/utils
parent1f854d1db709ea0eeac9f5469fda053bd38e72c4 (diff)
downloadsamba-b8fc15be950072846d23e3836d4d0289c10156f2.tar.gz
samba-b8fc15be950072846d23e3836d4d0289c10156f2.tar.bz2
samba-b8fc15be950072846d23e3836d4d0289c10156f2.zip
Refactoring: Make get_schannel_session_key return NTSTATUS
(This used to be commit a0793cc853d3bd43df2fc49df193a5fead6b01ab)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/net_rpc_join.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index 609068e3d0..2599c28e9c 100644
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -73,12 +73,13 @@ NTSTATUS net_rpc_join_ok(struct net_context *c, const char *domain,
}
/* Setup the creds as though we're going to do schannel... */
- netlogon_pipe = get_schannel_session_key(cli, domain, &neg_flags, &ntret);
+ ntret = get_schannel_session_key(cli, domain, &neg_flags,
+ &netlogon_pipe);
/* We return NT_STATUS_INVALID_NETWORK_RESPONSE if the server is refusing
to negotiate schannel, but the creds were set up ok. That'll have to do. */
- if (!netlogon_pipe) {
+ if (!NT_STATUS_IS_OK(ntret)) {
if (NT_STATUS_EQUAL(ntret, NT_STATUS_INVALID_NETWORK_RESPONSE)) {
cli_shutdown(cli);
return NT_STATUS_OK;