From c690be462d6dcfc8bdad6749ae055f11d810c89f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 4 Oct 2005 12:02:52 +0000 Subject: r10711: An error of 'user exists' is not an error, just an indication of how the join was processed. Andrew Bartlett (This used to be commit 0d93f11c894927a9ab69f7a31b9fbedde9d698b6) --- source4/utils/net/net_join.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/utils') diff --git a/source4/utils/net/net_join.c b/source4/utils/net/net_join.c index cb2ed3006b..8e9eb4d93e 100644 --- a/source4/utils/net/net_join.c +++ b/source4/utils/net/net_join.c @@ -76,7 +76,7 @@ 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)) { + 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)); -- cgit