From: Jeff Peeler <jpeeler@digium.com>
Date: Fri, 12 Nov 2010 21:14:43 +0000 (+0000)
Subject: Merged revisions 294910 via svnmerge from
X-Git-Tag: 1.8.1-rc1~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1abd401b9ff8865f4eb5b1beffb0ee1903d177f;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.8@294911 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index b22d3618c9..c0ac2e8ce0 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 */