aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-04-18 16:12:45 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-04-18 16:12:45 +0000
commit1fa2fc68fe12c449ef33d5a2b0ba92baf338cbca (patch)
tree1a0c7ff34226f2af4f2a9dfc20866cefaf8d0e2f /res
parent3689b46d9c6414b60a308dec476c8c19166b76e8 (diff)
Merged revisions 114254 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r114254 | file | 2008-04-18 13:11:27 -0300 (Fri, 18 Apr 2008) | 4 lines If the parsing of the config file fails make sure we unlock ldap_lock. (closes issue #12477) Reported by: IgorG ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114255 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_config_ldap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c
index a88e480a4..376f9aff8 100644
--- a/res/res_config_ldap.c
+++ b/res/res_config_ldap.c
@@ -1364,6 +1364,7 @@ static int reload(void)
if (parse_config() < 0) {
ast_log(LOG_NOTICE, "Cannot reload LDAP RealTime driver.\n");
+ ast_mutex_unlock(&ldap_lock);
return 0;
}