diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-10-04 12:02:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:39:23 -0500 |
| commit | c690be462d6dcfc8bdad6749ae055f11d810c89f (patch) | |
| tree | 5ac8ec6fcb857b0f382395fe80af7a6c9622a657 /source4 | |
| parent | a04f65b1c703e7622ebc1a85170f9980c2b33227 (diff) | |
| download | samba-c690be462d6dcfc8bdad6749ae055f11d810c89f.tar.gz samba-c690be462d6dcfc8bdad6749ae055f11d810c89f.tar.bz2 samba-c690be462d6dcfc8bdad6749ae055f11d810c89f.zip | |
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)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/utils/net/net_join.c | 2 |
1 files changed, 1 insertions, 1 deletions
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)); |