summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-01-12 02:19:21 +0100
committerGünther Deschner <gd@samba.org>2008-01-12 02:25:37 +0100
commit21ccb47044175128557766f36154e5eecd805318 (patch)
tree09d6a76e47651713461d3133641f612eb0904059
parentbc629c6faf5a575a39a31ffe6ced13165563ca29 (diff)
downloadsamba-21ccb47044175128557766f36154e5eecd805318.tar.gz
samba-21ccb47044175128557766f36154e5eecd805318.tar.bz2
samba-21ccb47044175128557766f36154e5eecd805318.zip
Add appropriate error code when pre-creating accounts in ous isnt supported by DC.
Guenther (This used to be commit 4a7acf4a2374138b20a5cdebdcc721668bbd865b)
-rw-r--r--source3/libnet/libnet_join.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index fbbbb51bbc..4c2e1301ab 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -1067,7 +1067,7 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
if (r->in.account_ou) {
ads_status = libnet_join_connect_ads(mem_ctx, r);
if (!ADS_ERR_OK(ads_status)) {
- return WERR_GENERAL_FAILURE;
+ return WERR_DEFAULT_JOIN_REQUIRED;
}
ads_status = libnet_join_precreate_machine_acct(mem_ctx, r);
if (!ADS_ERR_OK(ads_status)) {
@@ -1075,7 +1075,7 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
"failed to precreate account in ou %s: %s",
r->in.account_ou,
ads_errstr(ads_status));
- return WERR_GENERAL_FAILURE;
+ return WERR_DEFAULT_JOIN_REQUIRED;
}
r->in.join_flags &= ~WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE;