From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 13 Apr 2009 23:04:15 +0000 (+0000)
Subject: If fileconfig limit exceeds our maximum, then set the limit to the maximum.
X-Git-Tag: 1.4.25-rc1~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eaaa987fc286297fcf37caf8f16ed63ff189b54;p=thirdparty%2Fasterisk.git

If fileconfig limit exceeds our maximum, then set the limit to the maximum.
(Closes issue #14888)
Reported by: falves11


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@188149 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_odbc.c b/res/res_odbc.c
index b0fed02c99..be174aab1b 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -252,9 +252,13 @@ static int load_odbc_config(void)
 						ast_log(LOG_WARNING, "Limit should be a number, not a boolean: '%s'.  Setting limit to 1023 for ODBC class '%s'.\n", v->value, cat);
 						limit = 1023;
 					} else if (ast_false(v->value)) {
-						ast_log(LOG_WARNING, "Limit should be a number, not a boolean: '%s'.  Disabling ODBC class '%s'.\n", v->value, cat);
-						enabled = 0;
+						/* Limit=no probably means "no limit", which is the maximum */
+						ast_log(LOG_WARNING, "Limit should be a number, not a boolean: '%s'.  Setting limit to 1023 for ODBC class '%s'.\n", v->value, cat);
+						limit = 1023;
 						break;
+					} else if (limit > 1023) {
+						ast_log(LOG_WARNING, "Maximum limit in 1.4 is 1023.  Setting limit to 1023 for ODBC class '%s'.\n", cat);
+						limit = 1023;
 					}
 				} else if (!strcasecmp(v->name, "idlecheck")) {
 					sscanf(v->value, "%d", &idlecheck);