From: Automerge script <automerge@asterisk.org>
Date: Fri, 25 Aug 2006 16:02:33 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.12-netsec~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53a30e84eb9dbe0e12226239c72ae626d716741f;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index e00eee312d..fa86fe173c 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -5162,8 +5162,11 @@ static int vm_execmain(struct ast_channel *chan, void *data)
 
 		if (!ast_strlen_zero(vms.username) && (vmu = find_user(&vmus, context ,vms.username)))
 			skipuser++;
-		else
+		else {
+			if (!ast_strlen_zero(vms.username))
+				ast_log(LOG_NOTICE, "Specified user '%s%s%s' not found (check voicemail.conf and/or realtime config).  Falling back to authentication mode.\n", vms.username, context ? "@" : "", context ? context : "");
 			valid = 0;
+		}
 	}
 
 	if (!valid)
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index e0822f5e63..a661a84d89 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -8485,10 +8485,11 @@ static void *pri_dchannel(void *vpri)
 						res = set_actual_gain(pri->pvts[chanpos]->subs[SUB_REAL].zfd, 0, pri->pvts[chanpos]->rxgain, pri->pvts[chanpos]->txgain, law);
 						if (res < 0)
 							ast_log(LOG_WARNING, "Unable to set gains on channel %d\n", pri->pvts[chanpos]->channel);
-						if (e->ring.complete || !pri->overlapdial)
+						if (e->ring.complete || !pri->overlapdial) {
 							/* Just announce proceeding */
+							pri->pvts[chanpos]->proceeding = 1;
 							pri_proceeding(pri->pri, e->ring.call, PVT_TO_CHANNEL(pri->pvts[chanpos]), 0);
-						else  {
+						} else  {
 							if (pri->switchtype != PRI_SWITCH_GR303_TMC) 
 								pri_need_more_info(pri->pri, e->ring.call, PVT_TO_CHANNEL(pri->pvts[chanpos]), 1);
 							else