summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-02-28 17:02:14 +0100
committerGünther Deschner <gd@samba.org>2008-02-28 17:05:38 +0100
commit15f6e27bd5a9065c8b781fa21f5989ce2c355776 (patch)
tree157d9ddda4280739427fc4c6af5f3da26d52adda
parent4a8e6c9a91b772a924b8f0519d373457bb2a95ae (diff)
downloadsamba-15f6e27bd5a9065c8b781fa21f5989ce2c355776.tar.gz
samba-15f6e27bd5a9065c8b781fa21f5989ce2c355776.tar.bz2
samba-15f6e27bd5a9065c8b781fa21f5989ce2c355776.zip
Add some more error handling in libnetjoin.
Guenther (This used to be commit 892b2bc0cf1692c5707d322d0eb711b8245a3a96)
-rw-r--r--source3/libnet/libnet_join.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 623ca39f71..97fad95a68 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -1193,6 +1193,9 @@ static WERROR libnet_join_pre_processing(TALLOC_CTX *mem_ctx,
}
if (r->in.modify_config && !lp_config_backend_is_registry()) {
+ libnet_join_set_error_string(mem_ctx, r,
+ "Configuration manipulation requested but not "
+ "supported by backend");
return WERR_NOT_SUPPORTED;
}
@@ -1519,9 +1522,16 @@ static WERROR libnet_unjoin_pre_processing(TALLOC_CTX *mem_ctx,
}
if (r->in.modify_config && !lp_config_backend_is_registry()) {
+ libnet_unjoin_set_error_string(mem_ctx, r,
+ "Configuration manipulation requested but not "
+ "supported by backend");
return WERR_NOT_SUPPORTED;
}
+ if (IS_DC) {
+ return WERR_SETUP_DOMAIN_CONTROLLER;
+ }
+
if (!secrets_init()) {
libnet_unjoin_set_error_string(mem_ctx, r,
"Unable to open secrets database");