automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@34950 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 32e9f849e1f8adae33060c3b4b8d55d751dd0cd2..96973623f305f5fe4f3a0a5dba55025529c4d58a 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -763,8 +763,10 @@ static void vm_change_password_shell(struct ast_vm_user *vmu, char *newpassword)
 {
        char buf[255];
        snprintf(buf,255,"%s %s %s %s",ext_pass_cmd,vmu->context,vmu->mailbox,newpassword);
-       if (!ast_safe_system(buf))
+       if (!ast_safe_system(buf)) {
+               reset_user_pw(vmu->context, vmu->mailbox, newpassword);
                ast_copy_string(vmu->password, newpassword, sizeof(vmu->password));
+       }
 }
 
 static int make_dir(char *dest, int len, char *context, char *ext, char *mailbox)