From 2016b331394b619bda36422b3a42d484b4dc169d Mon Sep 17 00:00:00 2001
From: Naveen Albert <asterisk@phreaknet.org>
Date: Wed, 16 Feb 2022 11:34:34 +0000
Subject: [PATCH] app_voicemail: Emit warning if asking for nonexistent
mailbox.
Currently, if VoiceMailMain is called with a mailbox, if that
mailbox doesn't exist, then the application silently falls back
to prompting the user for the mailbox, as if no arguments were
provided.
However, if a specific mailbox is requested and it doesn't exist,
then no warning at all is emitted.
This fixes this behavior to now warn if a specifically
requested mailbox could not be accessed, before falling back to
prompting the user for the correct mailbox.
ASTERISK-29920 #close
Change-Id: Ib4093b88cd661a2cabc5d685777d4e2f0ebd20a4
---
apps/app_voicemail.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 6dec471db9..49d30e0999 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -11512,10 +11512,16 @@ static int vm_execmain(struct ast_channel *chan, const char *data)
else
ast_copy_string(vms.username, args.argv0, sizeof(vms.username));
- if (!ast_strlen_zero(vms.username) && (vmu = find_user(&vmus, context ,vms.username)))
- skipuser++;
- else
+ if (!ast_strlen_zero(vms.username)) {
+ if ((vmu = find_user(&vmus, context ,vms.username))) {
+ skipuser++;
+ } else {
+ ast_log(LOG_WARNING, "Mailbox '%s%s%s' doesn't exist\n", vms.username, context ? "@": "", context ? context : "");
+ valid = 0;
+ }
+ } else {
valid = 0;
+ }
}
if (!valid)
--
GitLab