From 387706a49dfdca539d0b1579703e6f96451ba040 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 5 Jun 2008 18:58:27 +0200 Subject: libnetjoin: First store configuration and then verify the join. Jerry, this fixes the issues while joining with "config backend = registry". Guenther (This used to be commit b3d47f099286778252c6df6bf2c1fee0c4e26560) --- source3/libnet/libnet_join.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 3b2bce9fcf..16dcc61afe 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -1333,6 +1333,8 @@ static WERROR do_JoinConfig(struct libnet_JoinCtx *r) return werr; } + lp_load(get_dyn_CONFIGFILE(),true,false,false,true); + r->out.modified_config = true; r->out.result = werr; @@ -1359,6 +1361,8 @@ static WERROR libnet_unjoin_config(struct libnet_UnjoinCtx *r) return werr; } + lp_load(get_dyn_CONFIGFILE(),true,false,false,true); + r->out.modified_config = true; r->out.result = werr; @@ -1748,17 +1752,20 @@ WERROR libnet_Join(TALLOC_CTX *mem_ctx, if (!W_ERROR_IS_OK(werr)) { goto done; } + } + werr = libnet_join_post_processing(mem_ctx, r); + if (!W_ERROR_IS_OK(werr)) { + goto done; + } + + if (r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE) { werr = libnet_join_post_verify(mem_ctx, r); if (!W_ERROR_IS_OK(werr)) { goto done; } } - werr = libnet_join_post_processing(mem_ctx, r); - if (!W_ERROR_IS_OK(werr)) { - goto done; - } done: r->out.result = werr; -- cgit