Merge "res_config_ldap: Fix erroneous LDAP_MOD_REPLACE in LDAP modify"
This commit is contained in:
commit
d5e25d8e3d
1 changed files with 7 additions and 4 deletions
|
@ -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 */
|
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 = ldap_memcalloc(sizeof(LDAPMod *), mods_size);
|
||||||
ldap_mods[0] = ldap_memcalloc(1, sizeof(LDAPMod));
|
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_type = ldap_strdup(newparam);
|
||||||
|
|
||||||
ldap_mods[0]->mod_values = ast_calloc(sizeof(char *), 2);
|
if (strlen(field->value) == 0) {
|
||||||
ldap_mods[0]->mod_values[0] = ldap_strdup(field->value);
|
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)) {
|
while ((field = field->next)) {
|
||||||
newparam = convert_attribute_name_to_ldap(table_config, field->name);
|
newparam = convert_attribute_name_to_ldap(table_config, field->name);
|
||||||
|
|
Loading…
Reference in a new issue