sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "res_config_ldap: Fix erroneous LDAP_MOD_REPLACE in LDAP modify"

This commit is contained in:
zuul 2017-02-21 17:57:24 -06:00 committed by Gerrit Code Review
parent 16b0bb39c1 d6d86f1c09
commit d5e25d8e3d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
res/res_config_ldap.c
View File

@ -1292,12 +1292,15 @@ static int update_ldap(const char *basedn, const char *table_name, const char *a
mods_size = 2; /* one for the first param/value pair and one for the the terminating NULL */
ldap_mods = ldap_memcalloc(sizeof(LDAPMod *), mods_size);
ldap_mods[0] = ldap_memcalloc(1, sizeof(LDAPMod));
ldap_mods[0]->mod_op = LDAP_MOD_REPLACE;
ldap_mods[0]->mod_type = ldap_strdup(newparam);
ldap_mods[0]->mod_values = ast_calloc(sizeof(char *), 2);
ldap_mods[0]->mod_values[0] = ldap_strdup(field->value);
if (strlen(field->value) == 0) {
ldap_mods[0]->mod_op = LDAP_MOD_DELETE;
} else {
ldap_mods[0]->mod_op = LDAP_MOD_REPLACE;
ldap_mods[0]->mod_values = ast_calloc(sizeof(char *), 2);
ldap_mods[0]->mod_values[0] = ldap_strdup(field->value);
}
while ((field = field->next)) {
newparam = convert_attribute_name_to_ldap(table_config, field->name);