From: Michael Adam <obnox@samba.org>
Date: Fri, 29 Aug 2008 15:55:28 +0000 (+0200)
Subject: libnet_join: streamline logic of libnet_join_post_processing()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81cc1af1e699e454fbb1d12636d002f845231006;p=thirdparty%2Fsamba.git

libnet_join: streamline logic of libnet_join_post_processing()

Michael
---

diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index b34b4872f49..a39dee676fc 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -1503,20 +1503,22 @@ 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;
+	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;
-			}
+		ads_status  = libnet_join_post_processing_ads(mem_ctx, r);
+		if (!ADS_ERR_OK(ads_status)) {
+			return WERR_GENERAL_FAILURE;
 		}
-#endif /* WITH_ADS */
 	}
+#endif /* WITH_ADS */
 
 	libnet_join_add_dom_rids_to_builtins(r->out.domain_sid);