diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-25 16:02:33 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-25 16:02:33 +0000 |
| commit | 5ed744093a12a270ce304cf3d88a733e7e90ddd1 (patch) | |
| tree | 7d59b9aebcbcf6469b2072aa198683008a3891ae | |
| parent | 42e2c2da3db6cba2780b125f5f1ad567d3e4b8e3 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41085 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_voicemail.c | 5 | ||||
| -rw-r--r-- | channels/chan_zap.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index e00eee312..fa86fe173 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 e0822f5e6..a661a84d8 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 |