From b8b4ae650118d251939dd23e05c94eec0d21c304 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Tue, 6 Jan 2009 21:38:19 +0000 Subject: [PATCH] Merged revisions 167301 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r167301 | mmichelson | 2009-01-06 15:36:44 -0600 (Tue, 06 Jan 2009) | 16 lines Merged revisions 167299 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r167299 | mmichelson | 2009-01-06 15:35:57 -0600 (Tue, 06 Jan 2009) | 8 lines Use the correct variable when creating the format string (closes issue #14177) Reported by: nic_bellamy Patches: asterisk-trunk-svn-r167242-ast_db_gettree.patch uploaded by nic (license 299) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167304 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/db.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/db.c b/main/db.c index 94bf4f0012..3fcf9eee2e 100644 --- a/main/db.c +++ b/main/db.c @@ -481,7 +481,7 @@ struct ast_db_entry *ast_db_gettree(const char *family, const char *keytree) if (!ast_strlen_zero(family)) { if (!ast_strlen_zero(keytree)) { /* Family and key tree */ - snprintf(prefix, sizeof(prefix), "/%s/%s", family, prefix); + snprintf(prefix, sizeof(prefix), "/%s/%s", family, keytree); } else { /* Family only */ snprintf(prefix, sizeof(prefix), "/%s", family); -- 2.47.3