[svn-commits] seanbright: trunk r147191 - /trunk/apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Tue Oct  7 11:40:24 2008
New Revision: 147191

URL: http://svn.digium.com/view/asterisk?view=rev&rev=147191
Log:
There was a boo-boo in TFOT that is causing some confusion on the mailing lists
so include 'imapsecret' as an alias to 'imappassword' (and print a little notice
nudging users toward the right option name).

Modified:
    trunk/apps/app_voicemail.c

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=147191&r1=147190&r2=147191
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Tue Oct  7 11:40:24 2008
@@ -775,6 +775,9 @@
 		ast_copy_string(vmu->imapuser, value, sizeof(vmu->imapuser));
 	} else if (!strcasecmp(var, "imappassword")) {
 		ast_copy_string(vmu->imappassword, value, sizeof(vmu->imappassword));
+	} else if (!strcasecmp(var, "imapsecret")) {
+		ast_log(LOG_WARNING, "Use of the 'imapsecret' option is discouraged, please use 'imappassword' instead.\n");
+		ast_copy_string(vmu->imappassword, value, sizeof(vmu->imappassword));
 #endif
 	} else if (!strcasecmp(var, "delete") || !strcasecmp(var, "deletevoicemail")) {
 		ast_set2_flag(vmu, ast_true(value), VM_DELETE);	
@@ -1008,6 +1011,9 @@
 		} else if (!strcasecmp(tmp->name, "imapuser")) {
 			ast_copy_string(retval->imapuser, tmp->value, sizeof(retval->imapuser));
 		} else if (!strcasecmp(tmp->name, "imappassword")) {
+			ast_copy_string(retval->imappassword, tmp->value, sizeof(retval->imappassword));
+		} else if (!strcasecmp(tmp->name, "imapsecret")) {
+			ast_log(LOG_WARNING, "Use of the 'imapsecret' option is discouraged, please use 'imappassword' instead.\n");
 			ast_copy_string(retval->imappassword, tmp->value, sizeof(retval->imappassword));
 #endif
 		} else