From d1500e8924b4f01573e30107d8f21a4116669b50 Mon Sep 17 00:00:00 2001 From: Automerge script Date: Fri, 21 Sep 2012 19:24:48 +0000 Subject: [PATCH] Merged revisions 373343 via svnmerge from file:///srv/subversion/repos/asterisk/branches/10 ................ r373343 | jrose | 2012-09-21 14:08:58 -0500 (Fri, 21 Sep 2012) | 10 lines 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 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@373367 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 a06da730c7..e23315dff8 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")) { -- 2.47.2