diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-06 21:38:19 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-06 21:38:19 +0000 |
commit | 1629d3508cb2048cbf0256c4946cd632c100ad7a (patch) | |
tree | e891a92547f90175c7b1ff289c2371324bc18b81 /main/db.c | |
parent | 7e5253ba238ca7c27913b4dc8ad737fcfb65fb9f (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@167304 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/db.c')
-rw-r--r-- | main/db.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); |