libnetjoin: First store configuration and then verify the join.

Jerry, this fixes the issues while joining with "config backend = registry".

Guenther
(cherry picked from commit b3d47f099286778252c6df6bf2c1fee0c4e26560)

1 files changed, 11 insertions, 4 deletions

diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index a69cceaef89..88cdc2c3dae 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -1332,6 +1332,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;
 
@@ -1358,6 +1360,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;
 
@@ -1747,17 +1751,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;