From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 5 Nov 2009 22:13:37 +0000 (+0000)
Subject: Merged revisions 228196 via svnmerge from
X-Git-Tag: 1.6.1.10-rc1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b84af6760ad556ca992fdfe2e384ae6b3bf65dea;p=thirdparty%2Fasterisk.git

Merged revisions 228196 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r228196 | tilghman | 2009-11-05 16:12:45 -0600 (Thu, 05 Nov 2009) | 2 lines

  Yet another error message in the dialplan (thanks, rmudgett/russellb)
........


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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 6d6923ad54..0268554aca 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -5821,7 +5821,8 @@ static int acf_meetme_info(struct ast_channel *chan, const char *cmd, char *data
 	if (result > -1) {
 		snprintf(buf, len, "%d", result);
 	} else if (result == -1) {
-		snprintf(buf, len, "%s %s", "Error: invalid keyword:", args.keyword);
+		ast_log(LOG_NOTICE, "Error: invalid keyword: '%s'\n", args.keyword);
+		snprintf(buf, len, "0");
 	} else if (result == -2) {
 		ast_log(LOG_NOTICE, "Error: conference (%s) not found\n", args.confno); 
 		snprintf(buf, len, "0");