svn commit: samba r10711 - in branches/SAMBA_4_0/source/utils/net: .
abartlet at samba.org
abartlet at samba.org
Tue Oct 4 12:02:53 GMT 2005
Author: abartlet
Date: 2005-10-04 12:02:52 +0000 (Tue, 04 Oct 2005)
New Revision: 10711
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10711
Log:
An error of 'user exists' is not an error, just an indication of how
the join was processed.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/utils/net/net_join.c
Changeset:
Modified: branches/SAMBA_4_0/source/utils/net/net_join.c
===================================================================
--- branches/SAMBA_4_0/source/utils/net/net_join.c 2005-10-04 11:21:57 UTC (rev 10710)
+++ branches/SAMBA_4_0/source/utils/net/net_join.c 2005-10-04 12:02:52 UTC (rev 10711)
@@ -76,7 +76,7 @@
/* 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));
More information about the samba-cvs
mailing list