diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-15 22:39:28 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-15 22:39:28 +0000 |
| commit | b42c8bb98b456c6577d523933d9b954944a6f27f (patch) | |
| tree | 86ff3d523a5a68aec97c13a1752b228f63b705e3 /apps | |
| parent | b033db7e755df0d7465ff75eed833a28a56ad8ca (diff) | |
Merged revisions 218731 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@218732 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 64fb016ad..c8d90bb59 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -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) |