Index: apps/app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.143
diff -u -r1.143 app_voicemail.c
--- apps/app_voicemail.c	3 Sep 2004 15:25:11 -0000	1.143
+++ apps/app_voicemail.c	4 Sep 2004 21:43:07 -0000
@@ -589,6 +589,7 @@
 		char tmpin[AST_CONFIG_MAX_PATH];
 		char tmpout[AST_CONFIG_MAX_PATH];
 		char *user, *pass, *rest, *trim, *tempcontext;
+		struct stat statbuf;
 		tempcontext = NULL;
 		snprintf(tmpin, sizeof(tmpin), "%s/voicemail.conf", ast_config_AST_CONFIG_DIR);
 		snprintf(tmpout, sizeof(tmpout), "%s/voicemail.conf.new", ast_config_AST_CONFIG_DIR);
@@ -663,7 +664,7 @@
 				
 				/* Compare user, pass AND context */
 				if (user && *user && !strcmp(user, vmu->mailbox) &&
-					 pass && *pass && !strcmp(pass, vmu->password) &&
+					 pass && !strcmp(pass, vmu->password) &&
 					 currcontext && *currcontext && !strcmp(currcontext, vmu->context)) {
 					/* This is the line */
 					if (rest) {
@@ -680,6 +681,9 @@
         fclose(configin);
         fclose(configout);
 
+		stat((char *)tmpin, &statbuf);
+		chmod((char *)tmpout, statbuf.st_mode);
+		chown((char *)tmpout, statbuf.st_uid, statbuf.st_gid);
         unlink((char *)tmpin);
         rename((char *)tmpout,(char *)tmpin);
 	reset_user_pw(vmu->context, vmu->mailbox, newpassword);