[svn-commits] mmichelson: trunk r167301 - in /trunk: ./ main/db.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Jan  6 15:36:44 2009
New Revision: 167301

URL: http://svn.digium.com/view/asterisk?view=rev&rev=167301
Log:
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)


........

Modified:
    trunk/   (props changed)
    trunk/main/db.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/db.c
URL: http://svn.digium.com/view/asterisk/trunk/main/db.c?view=diff&rev=167301&r1=167300&r2=167301
==============================================================================
--- trunk/main/db.c (original)
+++ trunk/main/db.c Tue Jan  6 15:36:44 2009
@@ -481,7 +481,7 @@
 	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);