diff options
| author | Günther Deschner <gd@samba.org> | 2008-06-05 18:58:27 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-06-05 19:34:06 +0200 |
| commit | 387706a49dfdca539d0b1579703e6f96451ba040 (patch) | |
| tree | 9b7a3d53299f2b00da7e8ee1be4fc3a2443ce57b | |
| parent | 21e759ef64ce75958c52c5c5215ee6f4d5151f25 (diff) | |
| download | samba-387706a49dfdca539d0b1579703e6f96451ba040.tar.gz samba-387706a49dfdca539d0b1579703e6f96451ba040.tar.bz2 samba-387706a49dfdca539d0b1579703e6f96451ba040.zip | |
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)
| -rw-r--r-- | source3/libnet/libnet_join.c | 15 |
1 files 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; |