diff options
| author | Michael Adam <obnox@samba.org> | 2008-08-29 17:43:12 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-08-29 18:00:51 +0200 |
| commit | 2d25608a5d5c2e38aba7f45ed96ffb271d25de66 (patch) | |
| tree | 5b47a1690552011b1b1688065a5ce8c392ef9718 /source3/libnet | |
| parent | 1f0cd6a7443b08044d9fbc328fc729e3e2658e46 (diff) | |
| download | samba-2d25608a5d5c2e38aba7f45ed96ffb271d25de66.tar.gz samba-2d25608a5d5c2e38aba7f45ed96ffb271d25de66.tar.bz2 samba-2d25608a5d5c2e38aba7f45ed96ffb271d25de66.zip | |
libnet: fix join by creating keytab after changing the config.
Michael
(This used to be commit 96d1c780bf9524b929e6026776602a5288aea73d)
Diffstat (limited to 'source3/libnet')
| -rw-r--r-- | source3/libnet/libnet_join.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index b7a15c558b..b34b4872f4 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -1505,6 +1505,17 @@ static WERROR libnet_join_post_processing(TALLOC_CTX *mem_ctx, if (r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE) { saf_store(r->in.domain_name, r->in.dc_name); + +#ifdef WITH_ADS + if (r->out.domain_is_ad) { + ADS_STATUS ads_status; + + ads_status = libnet_join_post_processing_ads(mem_ctx, r); + if (!ADS_ERR_OK(ads_status)) { + return WERR_GENERAL_FAILURE; + } + } +#endif /* WITH_ADS */ } libnet_join_add_dom_rids_to_builtins(r->out.domain_sid); @@ -1754,16 +1765,6 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx, goto done; } -#ifdef WITH_ADS - if (r->out.domain_is_ad) { - ads_status = libnet_join_post_processing_ads(mem_ctx, r); - if (!ADS_ERR_OK(ads_status)) { - werr = WERR_GENERAL_FAILURE; - goto done; - } - } -#endif /* WITH_ADS */ - werr = WERR_OK; done: |