[asterisk-commits] qwell: trunk r51189 - in /trunk: ./ apps/app_voicemail.c

[asterisk-commits at lists.digium.com]

Author: qwell
Date: Wed Jan 17 11:37:56 2007
New Revision: 51189

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

........
r51186 | qwell | 2007-01-17 11:36:53 -0600 (Wed, 17 Jan 2007) | 2 lines

re-add "password" for realtime voicemail

........

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=51189&r1=51188&r2=51189
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Wed Jan 17 11:37:56 2007
@@ -680,7 +680,7 @@
 	while (tmp) {
 		if (!strcasecmp(tmp->name, "vmpassword")) {
 			ast_copy_string(retval->password, tmp->value, sizeof(retval->password));
-		} else if (!strcasecmp(tmp->name, "secret")) { /* don't overwrite vmpassword if it exists */
+		} else if (!strcasecmp(tmp->name, "secret") || !strcasecmp(tmp->name, "password")) { /* don't overwrite vmpassword if it exists */
 			if (ast_strlen_zero(retval->password))
 				ast_copy_string(retval->password, tmp->value, sizeof(retval->password));
 		} else if (!strcasecmp(tmp->name, "uniqueid")) {