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

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

........
  r228191 | tilghman | 2009-11-05 15:24:21 -0600 (Thu, 05 Nov 2009) | 7 lines

  MEETME_INFO should not return a literal error message to the dialplan.
  (closes issue #15450)
   Reported by: JimVanM
   Patches:
         meetmeinfopatch.diff.txt uploaded by dbrooks (license 790)
   Tested by: JimVanM
........


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

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