[asterisk-commits] file: trunk r50406 - in /trunk: ./ main/config.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed Jan 10 13:49:26 2007
New Revision: 50406

URL: http://svn.digium.com/view/asterisk?view=rev&rev=50406
Log:
Merged revisions 50405 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r50405 | file | 2007-01-10 14:46:29 -0500 (Wed, 10 Jan 2007) | 2 lines

Fix parsing when using something like ldap settings. (done by anthonyl)

........

Modified:
    trunk/   (props changed)
    trunk/main/config.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/config.c
URL: http://svn.digium.com/view/asterisk/trunk/main/config.c?view=diff&rev=50406&r1=50405&r2=50406
==============================================================================
--- trunk/main/config.c (original)
+++ trunk/main/config.c Wed Jan 10 13:49:26 2007
@@ -1103,7 +1103,7 @@
 {
 	struct ast_config *config, *configtmp;
 	struct ast_variable *v;
-	char *driver, *table, *database, *stringp;
+	char *driver, *table, *database, *stringp, *tmp;
 
 	clear_config_maps();
 
@@ -1118,6 +1118,9 @@
 	for (v = ast_variable_browse(config, "settings"); v; v = v->next) {
 		stringp = v->value;
 		driver = strsep(&stringp, ",");
+
+		if ((tmp = strchr(stringp, '\"')))
+			stringp = tmp;
 
 		/* check if the database text starts with a double quote */
 		if (*stringp == '"') {