From 49be813673701a4c353c6dcf811edeab6c33f402 Mon Sep 17 00:00:00 2001 From: Automerge script Date: Mon, 22 May 2006 15:06:09 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@29433 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 2 +- pbx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index a8db48d7f7..129a571578 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -627,7 +627,7 @@ static int conf_cmd(int fd, int argc, char **argv) { user->chan->name, user->userflags & CONFFLAG_ADMIN ? "(Admin)" : "", user->userflags & CONFFLAG_MONITOR ? "(Listen only)" : "", - user->adminflags & ADMINFLAG_MUTED ? "(Admn Muted)" : "", + user->adminflags & ADMINFLAG_MUTED ? "(Admin Muted)" : "", istalking(user->talking)); ast_cli(fd,"%d users in that conference.\n",cnf->users); diff --git a/pbx.c b/pbx.c index 7cd94e6d2d..3e0c417243 100644 --- a/pbx.c +++ b/pbx.c @@ -4064,7 +4064,7 @@ static unsigned int get_month(char *mon) } if (c) { e = 0; - while((e < 12) && strcasecmp(mon, months[e])) e++; + while((e < 12) && strcasecmp(c, months[e])) e++; if (e >= 12) { ast_log(LOG_WARNING, "Invalid month '%s', assuming none\n", c); return 0; -- 2.47.2