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 9b2a693a9ada646f43ef217ec25de3d614521524..6d6923ad545e0da8f63aeb900f7252568eeae1a3 100644 (file)
--- 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;