summaryrefslogtreecommitdiff
path: root/source4/utils
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-12-22 06:47:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:47:35 -0500
commit8e0948bbad959f8809a19e40e6777705013f866c (patch)
treee447e5aad96a6691fc6f55d810b7b4dc822e723b /source4/utils
parente161613cbd1bab8d33df3b9d36d0d015fbb91e83 (diff)
downloadsamba-8e0948bbad959f8809a19e40e6777705013f866c.tar.gz
samba-8e0948bbad959f8809a19e40e6777705013f866c.tar.bz2
samba-8e0948bbad959f8809a19e40e6777705013f866c.zip
r12421: Handle the case where we are a joining as different account types far better.
Andrew Bartlett (This used to be commit 0ce82e8a41f0fdea9928e3e341680232cc640e18)
Diffstat (limited to 'source4/utils')
-rw-r--r--source4/utils/net/net_join.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source4/utils/net/net_join.c b/source4/utils/net/net_join.c
index 8e9eb4d93e..bec82c72d1 100644
--- a/source4/utils/net/net_join.c
+++ b/source4/utils/net/net_join.c
@@ -76,10 +76,9 @@ int net_join(struct net_context *ctx, int argc, const char **argv)
/* do the domain join */
status = libnet_Join(libnetctx, r, r);
- if (!NT_STATUS_IS_OK(status) && !NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) {
- DEBUG(0,("libnet_Join returned %s: %s\n",
- nt_errstr(status),
- r->out.error_string));
+ if (!NT_STATUS_IS_OK(status)) {
+ d_printf("Joining domain failed: %s\n",
+ r->out.error_string ? r->out.error_string : nt_errstr(status));
talloc_free(r);
talloc_free(libnetctx);
return -1;