[asterisk-commits] mmichelson: branch 1.6.0 r167304 - in /branches/1.6.0: ./ main/db.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Jan  6 15:38:19 2009
New Revision: 167304

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


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/db.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/db.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/db.c?view=diff&rev=167304&r1=167303&r2=167304
==============================================================================
--- branches/1.6.0/main/db.c (original)
+++ branches/1.6.0/main/db.c Tue Jan  6 15:38:19 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);