summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-01-12 02:20:33 +0100
committerGünther Deschner <gd@samba.org>2008-01-12 02:25:47 +0100
commitd4e5cadc1a9917190819bdebd0c14e8f3767503c (patch)
tree2bc28fb896b3720256419979754074c67e766370
parent21ccb47044175128557766f36154e5eecd805318 (diff)
downloadsamba-d4e5cadc1a9917190819bdebd0c14e8f3767503c.tar.gz
samba-d4e5cadc1a9917190819bdebd0c14e8f3767503c.tar.bz2
samba-d4e5cadc1a9917190819bdebd0c14e8f3767503c.zip
Fix some error strings in libnet_join.
Guenther (This used to be commit 8af80976a3a8dd9d02a6763e48b2c1d8003ae4dd)
-rw-r--r--source3/libnet/libnet_join.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 4c2e1301ab..a46b827257 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -457,7 +457,8 @@ static bool libnet_join_derive_salting_principal(TALLOC_CTX *mem_ctx,
status = ads_domain_func_level(r->in.ads, &domain_func);
if (!ADS_ERR_OK(status)) {
libnet_join_set_error_string(mem_ctx, r,
- "Failed to determine domain functional level!");
+ "failed to determine domain functional level: %s",
+ ads_errstr(status));
return false;
}
@@ -1081,8 +1082,12 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
r->in.join_flags &= ~WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE;
}
#endif /* WITH_ADS */
+
status = libnet_join_joindomain_rpc(mem_ctx, r);
if (!NT_STATUS_IS_OK(status)) {
+ libnet_join_set_error_string(mem_ctx, r,
+ "failed to join domain over rpc: %s",
+ nt_errstr(status));
if (NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) {
return WERR_SETUP_ALREADY_JOINED;
}