mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 18:55:19 +00:00 
			
		
		
		
	Merge "res_config_ldap: Fix erroneous LDAP_MOD_REPLACE in LDAP modify"
This commit is contained in:
		| @@ -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); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user