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

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 */