]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 43564 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Sun, 24 Sep 2006 15:01:09 +0000 (15:01 +0000)
committerRussell Bryant <russell@russellbryant.com>
Sun, 24 Sep 2006 15:01:09 +0000 (15:01 +0000)
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)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43565 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/iax2-provision.c

index 8febd5608aec72c703bbdcafdf255e2842470d71..c2c4c88c66a610818817478ed0d67922c02365dd 100644 (file)
@@ -466,15 +466,10 @@ static int iax_show_provisioning(int fd, int argc, char *argv[])
        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)