libnet: fix join by creating keytab after changing the config.
authorMichael Adam <obnox@samba.org>
Fri, 29 Aug 2008 15:43:12 +0000 (17:43 +0200)
committerMichael Adam <obnox@samba.org>
Fri, 29 Aug 2008 16:00:51 +0000 (18:00 +0200)
Michael
(This used to be commit 96d1c780bf9524b929e6026776602a5288aea73d)

source3/libnet/libnet_join.c

index b7a15c558b3124492cbb1b80f2701f33f4b71947..b34b4872f492c59a86e93629eeee2f390b165100 100644 (file)
@@ -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: