[svn-commits] jpeeler: trunk r294912 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Fri Nov 12 15:15:03 2010
New Revision: 294912

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=294912
Log:
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.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=294912&r1=294911&r2=294912
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Fri Nov 12 15:15:03 2010
@@ -7704,7 +7704,7 @@
 
 	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 */