kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 04:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 218731 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218731 | tilghman | 2009-09-15 17:33:10 -0500 (Tue, 15 Sep 2009) | 13 lines
  
  Merged revisions 218730 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218730 | tilghman | 2009-09-15 17:27:41 -0500 (Tue, 15 Sep 2009) | 6 lines
    
    If the user enters the same password as before, don't signal an error when the change does nothing.
    (closes issue #15492)
     Reported by: cbbs70a
     Patches: 
           20090713__issue15492.diff.txt uploaded by tilghman (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218732 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-09-15 22:39:28 +00:00
parent aae7d711d4
commit 893cd7e270
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/app_voicemail.c
View File

@@ -810,18 +810,17 @@ static void apply_option(struct ast_vm_user *vmu, const char *var, const char *v
static int change_password_realtime(struct ast_vm_user *vmu, const char *password)
{
int res;
if (!ast_strlen_zero(vmu->uniqueid)) {
res = ast_update_realtime("voicemail", "uniqueid", vmu->uniqueid, "password", password, NULL);
if (res > 0) {
int res = -1;
if (!strcmp(vmu->password, password)) {
/* No change (but an update would return 0 rows updated, so we opt out here) */
return 0;
} else if (!ast_strlen_zero(vmu->uniqueid)) {
if (ast_update_realtime("voicemail", "uniqueid", vmu->uniqueid, "password", password, NULL) > 0) {
ast_copy_string(vmu->password, password, sizeof(vmu->password));
res = 0;
} else if (!res) {
res = -1;
}
return res;
}
return -1;
return res;
}
static void apply_options(struct ast_vm_user *vmu, const char *options)