From: Sean Bright <sean@malleable.com>
Date: Wed, 19 Jan 2011 23:47:22 +0000 (+0000)
Subject: Support greetingsfolder as documented in voicemail.conf.sample.
X-Git-Tag: 1.6.2.18-rc1~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39a167a12a10acef21102738a23c681150ef41f8;p=thirdparty%2Fasterisk.git

Support greetingsfolder as documented in voicemail.conf.sample.

(closes issue #17870)
Reported by: edhorton
Patches:
      __20100816-app_voicemail-greetingsfolder-support.txt uploaded by lmadsen (license 10)


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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 298b033fe8..4ac2c5a49d 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -10976,6 +10976,9 @@ static int load_config(int reload)
 		}
 		if ((val = ast_variable_retrieve(cfg, "general", "greetingfolder"))) {
 			ast_copy_string(greetingfolder, val, sizeof(greetingfolder));
+		} else if ((val = ast_variable_retrieve(cfg, "general", "greetingsfolder"))) {
+			/* Also support greetingsfolder as documented in voicemail.conf.sample */
+			ast_copy_string(greetingfolder, val, sizeof(greetingfolder));
 		} else {
 			ast_copy_string(greetingfolder, imapfolder, sizeof(greetingfolder));
 		}