[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3935-g81cc1af

[Michael Adam]

The branch, v3-devel has been updated
       via  81cc1af1e699e454fbb1d12636d002f845231006 (commit)
       via  96d1c780bf9524b929e6026776602a5288aea73d (commit)
      from  e572ede9995a66ae452ab25018b8df16101a2c2a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel


- Log -----------------------------------------------------------------
commit 81cc1af1e699e454fbb1d12636d002f845231006
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 29 17:55:28 2008 +0200

    libnet_join: streamline logic of libnet_join_post_processing()
    
    Michael

commit 96d1c780bf9524b929e6026776602a5288aea73d
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 29 17:43:12 2008 +0200

    libnet: fix join by creating keytab after changing the config.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source/libnet/libnet_join.c |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index b7a15c5..a39dee6 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -1503,10 +1503,23 @@ static WERROR libnet_join_post_processing(TALLOC_CTX *mem_ctx,
 		return werr;
 	}
 
-	if (r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE) {
-		saf_store(r->in.domain_name, r->in.dc_name);
+	if (!(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE)) {
+		return WERR_OK;
 	}
 
+	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);
 
 	return WERR_OK;
@@ -1754,16 +1767,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:


-- 
Samba Shared Repository