s3-libnet_join: always check config correctness while joining offline

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 48d2a2db046f792461b68efd5731c85121d8242e..263420a2159a08944cce3f6aacda8b97483af088 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -2763,11 +2763,12 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
                return ntstatus_to_werror(status);
        }
 
-       if (!r->in.provision_computer_account_only) {
-               werr = libnet_join_check_config(mem_ctx, r);
-               if (!W_ERROR_IS_OK(werr)) {
+       werr = libnet_join_check_config(mem_ctx, r);
+       if (!W_ERROR_IS_OK(werr)) {
+               if (!r->in.provision_computer_account_only) {
                        goto done;
                }
+               /* do not fail when only provisioning */
        }
 
 #ifdef HAVE_ADS
@@ -2914,6 +2915,11 @@ static WERROR libnet_DomainOfflineJoin(TALLOC_CTX *mem_ctx,
                return ntstatus_to_werror(status);
        }
 
+       werr = libnet_join_check_config(mem_ctx, r);
+       if (!W_ERROR_IS_OK(werr)) {
+               return werr;
+       }
+
        return WERR_OK;
 #if 0
        /* the following fields are currently not filled in */