AD: Ignore option inherit failure

The previous code logged a message indicating that errors are ignored, but it did not actually ignore errors, and did not properly free subdom_conf_path if inheriting AD_USE_LDAP failed. Reviewed-by: Pavel Březina <[email protected]> Reviewed-by: Tomáš Halman <[email protected]>
ZJAY998 · Oct 3, 2022 · 74be536 · 74be536
1 parent d91a814
commit 74be536
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/providers/ad/ad_subdomains.c b/src/providers/ad/ad_subdomains.c
@@ -335,8 +335,6 @@ ad_subdom_ad_ctx_new(struct be_ctx *be_ctx,
               "behavior later on.\n",
               id_ctx->ad_options->basic[AD_USE_LDAPS].opt_name,
               subdom->name);
-
-        return ret;
     }
 
     if (dp_opt_get_bool(ad_options->basic, AD_USE_LDAPS)) {
@@ -347,18 +345,17 @@ ad_subdom_ad_ctx_new(struct be_ctx *be_ctx,
                                     ad_options->id->basic,
                                     be_ctx->cdb, subdom_conf_path,
                                     SDAP_SASL_MECH);
-    talloc_free(subdom_conf_path);
     if (ret != EOK) {
         DEBUG(SSSDBG_CRIT_FAILURE,
               "Failed to inherit option [%s] to sub-domain [%s]. "
               "This error is ignored but might cause issues or unexpected "
               "behavior later on.\n",
               id_ctx->ad_options->id->basic[SDAP_SASL_MECH].opt_name,
               subdom->name);
-
-        return ret;
     }
 
+    talloc_free(subdom_conf_path);
+
     ad_site_override = dp_opt_get_string(ad_options->basic, AD_SITE);
 
     gc_service_name = talloc_asprintf(ad_options, "sd_gc_%s", subdom->name);