diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-22 15:06:09 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-22 15:06:09 +0000 |
commit | 548c3a5ab96934b75f643b348d2c68b7e33fb6c9 (patch) | |
tree | 05ac4b70c15b1e2e144a1f5c372c5fb45b18fda3 | |
parent | acca6194fe359f36ddd3e1eb76166c8e7248a311 (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@29433 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_meetme.c | 2 | ||||
-rw-r--r-- | pbx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index a8db48d7f..129a57157 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); @@ -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; |