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 e00eee312dee8ead1c159df4a913cee98695fead..fa86fe173ca8c1f0942ca5f6a34b34cc8775512f 100644 (file)
--- 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 e0822f5e6359618bb96b87c619b823970d02ac35..a661a84d89d16c5a1ca8ee7abd5bf0a2f3132b68 100644 (file)
--- 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