diff options
| author | Sean Bright <sean.bright@gmail.com> | 2017-02-20 06:27:38 -0500 |
|---|---|---|
| committer | Sean Bright <sean.bright@gmail.com> | 2017-02-20 07:05:31 -0500 |
| commit | d6d86f1c09f041ef00c1d106d924cf918172974a (patch) | |
| tree | ecec1d0dbb0b52be217e4adb243483d455a9ef25 /res/res_config_ldap.c | |
| parent | a6225d100eecfef74172ef308b7eb066e19488e5 (diff) | |
res_config_ldap: Fix erroneous LDAP_MOD_REPLACE in LDAP modify
We always treat the first change of our modification batch as a
replacement when it sometimes is actually a delete. So we have to pass
the correct arguments to the OpenLDAP library.
ASTERISK-26580 #close
Reported by: Nicholas John Koch
Patches:
res_config_ldap.c-11.24.1.patch (license #6833) patch uploaded
by Nicholas John Koch
Change-Id: I0741d25de07c9539f1edc6eff3696165dfb64fbe
Diffstat (limited to 'res/res_config_ldap.c')
| -rw-r--r-- | res/res_config_ldap.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index 5e95853d4..a8a8fe696 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -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); |