diff options
| author | Stefan Metzmacher <metze@samba.org> | 2017-05-18 15:52:59 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2017-06-27 16:57:44 +0200 |
| commit | 559de1e7236fd4a38f2a1f9980216db95d0430ce (patch) | |
| tree | c5b8a9fe0f79bfe09c991305b8f11f37fd821bd3 /source3/libnet | |
| parent | 0ab7944a2b00df4aa155a239c86f97e4e731b864 (diff) | |
| download | samba-559de1e7236fd4a38f2a1f9980216db95d0430ce.tar.gz | |
s3:libnet_join: call do_JoinConfig() after we did remote changes on the server
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/libnet')
| -rw-r--r-- | source3/libnet/libnet_join.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 7493ac88804..5e4a0d36c49 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -2211,12 +2211,12 @@ static WERROR libnet_join_post_processing(TALLOC_CTX *mem_ctx, return r->out.result; } - werr = do_JoinConfig(r); - if (!W_ERROR_IS_OK(werr)) { - return werr; - } - if (!(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE)) { + werr = do_JoinConfig(r); + if (!W_ERROR_IS_OK(werr)) { + return werr; + } + return WERR_OK; } @@ -2237,6 +2237,11 @@ static WERROR libnet_join_post_processing(TALLOC_CTX *mem_ctx, saf_join_store(r->out.dns_domain_name, r->in.dc_name); } + werr = do_JoinConfig(r); + if (!W_ERROR_IS_OK(werr)) { + return werr; + } + #ifdef HAVE_ADS if (r->out.domain_is_ad && !(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_UNSECURE)) { |