diff options
author | ghenry <ghenry@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-26 20:25:54 +0000 |
---|---|---|
committer | ghenry <ghenry@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-26 20:25:54 +0000 |
commit | cfdf0f62177f285b8721b0e56518ebd247b4edb5 (patch) | |
tree | a3acc277712fe6fa6a33fa0d72b77edb4e2056f7 | |
parent | ab59ca2d61776d1b67a3123a90ec02add5be1803 (diff) |
Apply all patches in:
https://issues.asterisk.org/view.php?id=13573
(closes issue #13573)
Reported by: navkumar
Patches:
res_config_ldap-category.diff uploaded by navkumar (license 580)
res_config_ldap.patch uploaded by bencer (license 961)
res_config_ldap uploaded by bencer (license 961)
Tested by: suretec
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@279597 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | res/res_config_ldap.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index d02353383..ea2ad749a 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -65,7 +65,7 @@ AST_MUTEX_DEFINE_STATIC(ldap_lock); static LDAP *ldapConn; static char url[512]; static char user[512]; -static char pass[50]; +static char pass[512]; static char base_distinguished_name[512]; static int version = 3; static time_t connect_time; @@ -938,10 +938,24 @@ static struct ast_variable *realtime_ldap(const char *basedn, static struct ast_config *realtime_multi_ldap(const char *basedn, const char *table_name, va_list ap) { + char *op; + const char *initfield = NULL; + const char *newparam, *newval; struct ast_variable **vars = realtime_ldap_base_ap(NULL, basedn, table_name, ap); struct ast_config *cfg = NULL; + newparam = va_arg(ap, const char *); + newval = va_arg(ap, const char *); + if (!newparam || !newval) { + ast_log(LOG_WARNING, "realtime retrieval requires at least 1 parameter and 1 value to search on.\n"); + return NULL; + } + initfield = ast_strdupa(newparam); + if ((op = strchr(initfield, ' '))) { + *op = '\0'; + } + if (vars) { cfg = ast_config_new(); if (!cfg) { @@ -959,6 +973,9 @@ static struct ast_config *realtime_multi_ldap(const char *basedn, struct ast_variable *var = *p; while (var) { struct ast_variable *next = var->next; + if (initfield && !strcmp(initfield, var->name)) { + ast_category_rename(cat, var->value); + } var->next = NULL; ast_variable_append(cat, var); var = next; |