libnet_join: streamline logic of libnet_join_post_processing()

Michael
(cherry picked from commit 81cc1af1e699e454fbb1d12636d002f845231006)
(cherry picked from commit 3ea63ec10c37460253fbe68d63576e0cd8783c11)

diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index 285504d4a2e2017f1d63b2ab4019f0c93985dd27..1226983798be198b4795b12cb130d94bac65a962 100644 (file)
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -1463,20 +1463,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 */
 
        return WERR_OK;
 }