Merge "res_config_ldap: Fix configuration inheritance from _general" into 14

1 files changed, 18 insertions, 1 deletions

diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c
index bfc959f1c..c7ff9da0f 100644
--- a/res/res_config_ldap.c
+++ b/res/res_config_ldap.c
@@ -1684,6 +1684,21 @@ static int reload(void)
 	return 0;
 }
 
+static int config_can_be_inherited(const char *key)
+{
+	int i;
+	static const char * const config[] = {
+		"basedn", "host", "pass", "port", "protocol", "url", "user", "version", NULL
+	};
+
+	for (i = 0; config[i]; i++) {
+		if (!strcasecmp(key, config[i])) {
+			return 0;
+		}
+	}
+	return 1;
+}
+
 /*! \brief parse the configuration file
  */
 static int parse_config(void)
@@ -1774,7 +1789,9 @@ static int parse_config(void)
 				if (!strcasecmp(var->name, "additionalFilter")) {
 					table_config->additional_filter = ast_strdup(var->value);
 				} else {
-					ldap_table_config_add_attribute(table_config, var->name, var->value);
+					if (!is_general || config_can_be_inherited(var->name)) {
+						ldap_table_config_add_attribute(table_config, var->name, var->value);
+					}
 				}
 			}
 		}