diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-12 21:15:03 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-12 21:15:03 +0000 |
| commit | 24122ad49ca64ee62e509fd1010bdc1a048cc055 (patch) | |
| tree | 5cd14f0f8b4f9cf0b85ede9f8980aab8233a5afe /apps | |
| parent | dd84d3e2e86806a5b3218554e6c2cb5b139a0836 (diff) | |
Merged revisions 294911 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r294911 | jpeeler | 2010-11-12 15:14:43 -0600 (Fri, 12 Nov 2010) | 11 lines
Merged revisions 294910 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r294910 | jpeeler | 2010-11-12 15:14:23 -0600 (Fri, 12 Nov 2010) | 4 lines
Return correct error code if lock path fails. The recent changes to open_mailbox actually caused it to be fixed, but let's be consistent.
Reported by alecdavis in asterisk-dev.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@294912 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index b22d3618c..c0ac2e8ce 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -7704,7 +7704,7 @@ static int open_mailbox(struct vm_state *vms, struct ast_vm_user *vmu, int box) if (vm_lock_path(vms->curdir)) { ast_log(AST_LOG_ERROR, "Could not open mailbox %s: mailbox is locked\n", vms->curdir); - return -1; + return ERROR_LOCK_PATH; } /* for local storage, checks directory for messages up to maxmsg limit */ |