Merged revisions 167299 via svnmerge from
authorMark Michelson <mmichelson@digium.com>
Tue, 6 Jan 2009 21:36:44 +0000 (21:36 +0000)
committerMark Michelson <mmichelson@digium.com>
Tue, 6 Jan 2009 21:36:44 +0000 (21:36 +0000)
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/trunk@167301 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/db.c

index 5d0a05a..46601dc 100644 (file)
--- 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);