[asterisk-commits] russell: trunk r43565 - in /trunk: ./ channels/iax2-provision.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sun Sep 24 10:01:09 2006
New Revision: 43565

URL: http://svn.digium.com/view/asterisk?rev=43565&view=rev
Log:
Merged revisions 43564 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43564 | russell | 2006-09-24 10:58:10 -0400 (Sun, 24 Sep 2006) | 5 lines

Fix a CLI command registration issue where an erroneous message claiming that
"iax2 show provisioning" was already registered.  This was because this command
was registering itself as both the command, as well as the command it is
deprecating.  (issue #8022, reported by bjweeks, fixed by myself)

........

Modified:
    trunk/   (props changed)
    trunk/channels/iax2-provision.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Sun Sep 24 10:01:09 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441,43445,43450,43454,43456,43464,43466,43469,43477,43482,43486,43489,43492,43518,43524,43553
+/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441,43445,43450,43454,43456,43464,43466,43469,43477,43482,43486,43489,43492,43518,43524,43553,43564

Modified: trunk/channels/iax2-provision.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/iax2-provision.c?rev=43565&r1=43564&r2=43565&view=diff
==============================================================================
--- trunk/channels/iax2-provision.c (original)
+++ trunk/channels/iax2-provision.c Sun Sep 24 10:01:09 2006
@@ -466,15 +466,10 @@
 	return RESULT_SUCCESS;
 }
 
-static struct ast_cli_entry cli_iax2_show_provisioning = {
-	{ "iax2", "show", "provisioning", NULL },
-	iax_show_provisioning, NULL,
-	NULL, iax_prov_complete_template };
-
 static struct ast_cli_entry cli_iax2_provision[] = {
 	{ { "iax2", "show", "provisioning", NULL },
 	iax_show_provisioning, "Display iax provisioning",
-	show_provisioning_usage, iax_prov_complete_template, &cli_iax2_show_provisioning },
+	show_provisioning_usage, iax_prov_complete_template, },
 };
 
 static int iax_provision_init(void)