[svn-commits] jrose: trunk r373369 - in /trunk: ./ channels/iax2-provision.c

[SVN commits to the Digium repositories]

Author: jrose
Date: Fri Sep 21 14:35:37 2012
New Revision: 373369

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=373369
Log:
iax2-provision: Fix improper return on failed cache retrieval

(closes issue ASTERISK-20337)
reported by: John Covert
Patches:
    iax2-provision.c.patch uploaded by John Covert (license 5512)
........

Merged revisions 373342 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 373343 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 373368 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/channels/iax2-provision.c

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

Modified: trunk/channels/iax2-provision.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/iax2-provision.c?view=diff&rev=373369&r1=373368&r2=373369
==============================================================================
--- trunk/channels/iax2-provision.c (original)
+++ trunk/channels/iax2-provision.c Fri Sep 21 14:35:37 2012
@@ -262,10 +262,8 @@
 	memset(&ied, 0, sizeof(ied));
 
 	ast_mutex_lock(&provlock);
-	if (!(ast_db_get("iax/provisioning/cache", template, tmp, sizeof(tmp)))) {
-		ast_log(LOG_ERROR, "ast_db_get failed to retrieve iax/provisioning/cache\n");
-		ast_mutex_unlock(&provlock);
-		return -1;
+	if (ast_db_get("iax/provisioning/cache", template, tmp, sizeof(tmp))) {
+		ast_log(LOG_ERROR, "ast_db_get failed to retrieve iax/provisioning/cache/%s\n", template);
 	}
 	if (sscanf(tmp, "v%30x", version) != 1) {
 		if (strcmp(tmp, "u")) {