From: Joshua Colp <jcolp@digium.com>
Date: Mon, 19 Nov 2007 15:55:08 +0000 (+0000)
Subject: Merged revisions 89419 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~776
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1affda12a228bfdd68c48f9db7c7e0f7d948725c;p=thirdparty%2Fasterisk.git

Merged revisions 89419 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89419 | file | 2007-11-19 11:53:32 -0400 (Mon, 19 Nov 2007) | 6 lines

Print out the correct filename (features.conf) in the log message when parkpos options are incorrect.
(closes issue #11295)
Reported by: Laureano
Patches:
      res_features.c.patch uploaded by Laureano (license 265)

........


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

diff --git a/res/res_features.c b/res/res_features.c
index 51c75e1f62..9d6356ae71 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -2885,7 +2885,7 @@ static int load_config(void)
 				parkingtime = parkingtime * 1000;
 		} else if (!strcasecmp(var->name, "parkpos")) {
 			if (sscanf(var->value, "%d-%d", &start, &end) != 2) {
-				ast_log(LOG_WARNING, "Format for parking positions is a-b, where a and b are numbers at line %d of parking.conf\n", var->lineno);
+				ast_log(LOG_WARNING, "Format for parking positions is a-b, where a and b are numbers at line %d of features.conf\n", var->lineno);
 			} else {
 				parking_start = start;
 				parking_stop = end;