[asterisk-commits] seanbright: trunk r147194 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Tue Oct  7 11:52:02 2008
New Revision: 147194

URL: http://svn.digium.com/view/asterisk?view=rev&rev=147194
Log:
Merged revisions 147193 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r147193 | seanbright | 2008-10-07 12:48:30 -0400 (Tue, 07 Oct 2008) | 2 lines

Make 'imapsecret' an alias to 'imappassword' in voicemail.conf.

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=147194&r1=147193&r2=147194
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Tue Oct  7 11:52:02 2008
@@ -773,9 +773,7 @@
 #ifdef IMAP_STORAGE
 	} else if (!strcasecmp(var, "imapuser")) {
 		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")) {
+	} else if (!strcasecmp(var, "imappassword") || !strcasecmp(var, "imapsecret")) {
 		ast_copy_string(vmu->imappassword, value, sizeof(vmu->imappassword));
 #endif
 	} else if (!strcasecmp(var, "delete") || !strcasecmp(var, "deletevoicemail")) {
@@ -1009,9 +1007,7 @@
 #ifdef IMAP_STORAGE
 		} 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")) {
+		} else if (!strcasecmp(tmp->name, "imappassword") || !strcasecmp(tmp->name, "imapsecret")) {
 			ast_copy_string(retval->imappassword, tmp->value, sizeof(retval->imappassword));
 #endif
 		} else