summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-07-07 00:20:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:19:11 -0500
commit03d116a1b7889f15f83219711477193e28fd2d04 (patch)
tree3a91166a559f5e7805fde54225312cc34cc14177
parent67d8c7432f116a0721b9bbff38632b8cc0535259 (diff)
downloadsamba-03d116a1b7889f15f83219711477193e28fd2d04.tar.gz
samba-03d116a1b7889f15f83219711477193e28fd2d04.tar.bz2
samba-03d116a1b7889f15f83219711477193e28fd2d04.zip
r16845: Properly report the error during join when the set password fails
(This used to be commit ef6e9ca5276586c081fcf18bb178a2326309b539)
-rw-r--r--source3/utils/net_domain.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source3/utils/net_domain.c b/source3/utils/net_domain.c
index ae8d6b6c55..a4a52b2384 100644
--- a/source3/utils/net_domain.c
+++ b/source3/utils/net_domain.c
@@ -302,6 +302,13 @@ NTSTATUS netdom_join_domain( TALLOC_CTX *mem_ctx, struct cli_state *cli,
status = rpccli_samr_set_userinfo(pipe_hnd, mem_ctx, &user_pol,
24, &cli->user_session_key, &ctr);
+ if ( !NT_STATUS_IS_OK(status) ) {
+ d_fprintf( stderr, "Failed to set password for machine account (%s)\n",
+ nt_errstr(status));
+ return status;
+ }
+
+
/* Why do we have to try to (re-)set the ACB to be the same as what
we passed in the samr_create_dom_user() call? When a NT
workstation is joined to a domain by an administrator the