From ca8aeeef1bead57973f91fce0e4ed239d73a00b3 Mon Sep 17 00:00:00 2001
From: Jonathan Rose <jrose@digium.com>
Date: Fri, 21 Sep 2012 19:35:37 +0000
Subject: [PATCH] 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
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@373369 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/iax2-provision.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c
index ff647e6949..a00d6f73cf 100644
--- a/channels/iax2-provision.c
+++ b/channels/iax2-provision.c
@@ -262,10 +262,8 @@ int iax_provision_version(unsigned int *version, const char *template, int force
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")) {