[asterisk-commits] anthonyl: branch anthonyl/usersconf-vmpassword r50990 - /team/anthonyl/usersc...

[asterisk-commits at lists.digium.com]

Author: anthonyl
Date: Mon Jan 15 17:23:15 2007
New Revision: 50990

URL: http://svn.digium.com/view/asterisk?view=rev&rev=50990
Log:
some more svnmerge fixes

Modified:
    team/anthonyl/usersconf-vmpassword/apps/app_voicemail.c

Modified: team/anthonyl/usersconf-vmpassword/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/anthonyl/usersconf-vmpassword/apps/app_voicemail.c?view=diff&rev=50990&r1=50989&r2=50990
==============================================================================
--- team/anthonyl/usersconf-vmpassword/apps/app_voicemail.c (original)
+++ team/anthonyl/usersconf-vmpassword/apps/app_voicemail.c Mon Jan 15 17:23:15 2007
@@ -789,7 +789,7 @@
 		return;
 
 	/* check voicemail.conf */
-	if ((cfg = ast_config_load("voicemail.conf"))) {
+	if ((cfg = ast_config_load(VOICEMAIL_CONFIG))) {
 		while ((category = ast_category_browse(cfg, category))) {
 			if (!strcasecmp(category, vmu->context)) {
 				tmp = ast_variable_retrieve(cfg, category, vmu->mailbox);
@@ -820,14 +820,12 @@
 		/* save the results */
 		reset_user_pw(vmu->context, vmu->mailbox, newpassword);
 		ast_copy_string(vmu->password, newpassword, sizeof(vmu->password));
-		config_text_file_save("voicemail.conf", cfg, "AppVoicemail");
+		config_text_file_save(VOICEMAIL_CONFIG, cfg, "AppVoicemail");
 		if (new)
 			free(new);
 	}
-
 	category = NULL;
 	var = NULL;
-
 	/* check users.conf and update the password stored for the mailbox*/
 	/* if no vmpassword entry exists create one. */
 	if ((cfg = ast_config_load("users.conf"))) {
@@ -860,7 +858,7 @@
 		if (new) 
 			free(new);
 	}
-	return;
+
 }
 
 static void vm_change_password_shell(struct ast_vm_user *vmu, char *newpassword)