new libcli required

diff --git a/Changes b/Changes
index c7c86e1..0d6ee8d 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,6 @@
 * Thu Nov 11 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.6
 - Make BGP keepalive/hold time configurable
 * Thu Nov 11 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.6
 - Make BGP keepalive/hold time configurable

-- Revise BGP config to use "router bgp AS" syntax
+- Revise BGP config to use "router bgp AS" syntax (requires libcli >= 1.8.2)

 
 * Tue Nov 9 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.5
 - Handle routing properly in lone-master case 
 
 * Tue Nov 9 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.5
 - Handle routing properly in lone-master case 

diff --git a/cli.c b/cli.c
index 63a1554..22c592a 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -2,7 +2,7 @@
 // vim: sw=8 ts=8
 
 char const *cvs_name = "$Name:  $";
 // vim: sw=8 ts=8
 
 char const *cvs_name = "$Name:  $";

-char const *cvs_id_cli = "$Id: cli.c,v 1.25 2004/11/11 03:07:42 bodea Exp $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.26 2004/11/11 05:38:01 bodea Exp $";

 
 #include <stdio.h>
 #include <stdarg.h>
 
 #include <stdio.h>
 #include <stdarg.h>


@@ -104,7 +104,6 @@ static void parsemac(char *string, char mac[6]);
 #ifdef BGP
 #define MODE_CONFIG_BGP 8
 static int cmd_router_bgp(struct cli_def *cli, char *command, char **argv, int argc);
 #ifdef BGP
 #define MODE_CONFIG_BGP 8
 static int cmd_router_bgp(struct cli_def *cli, char *command, char **argv, int argc);

-static int cmd_router_bgp_exit(struct cli_def *cli, char *command, char **argv, int argc);

 static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_router_bgp_no_neighbour(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_show_bgp(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_router_bgp_no_neighbour(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_show_bgp(struct cli_def *cli, char *command, char **argv, int argc);


@@ -187,7 +186,6 @@ void init_cli(char *hostname)
        c = cli_register_command(cli, NULL, "router", NULL, PRIVILEGE_PRIVILEGED, MODE_CONFIG, NULL);
        cli_register_command(cli, c, "bgp", cmd_router_bgp, PRIVILEGE_PRIVILEGED, MODE_CONFIG, "Configure BGP");
 
        c = cli_register_command(cli, NULL, "router", NULL, PRIVILEGE_PRIVILEGED, MODE_CONFIG, NULL);
        cli_register_command(cli, c, "bgp", cmd_router_bgp, PRIVILEGE_PRIVILEGED, MODE_CONFIG, "Configure BGP");
 

-       cli_register_command(cli, NULL, "exit", cmd_router_bgp_exit, PRIVILEGE_PRIVILEGED, MODE_CONFIG_BGP, "Exit from BGP configuration");

        cli_register_command(cli, NULL, "neighbour", cmd_router_bgp_neighbour, PRIVILEGE_PRIVILEGED, MODE_CONFIG_BGP, "Configure BGP neighbour");
 
        c = cli_register_command(cli, NULL, "no", NULL, PRIVILEGE_PRIVILEGED, MODE_CONFIG_BGP, NULL);
        cli_register_command(cli, NULL, "neighbour", cmd_router_bgp_neighbour, PRIVILEGE_PRIVILEGED, MODE_CONFIG_BGP, "Configure BGP neighbour");
 
        c = cli_register_command(cli, NULL, "no", NULL, PRIVILEGE_PRIVILEGED, MODE_CONFIG_BGP, NULL);

diff --git a/l2tpns.spec b/l2tpns.spec
index 7552710..c0c974e 100644 (file)
--- a/l2tpns.spec
+++ b/l2tpns.spec
@@ -8,8 +8,8 @@ Source: http://optusnet.dl.sourceforge.net/sourceforge/l2tpns/l2tpns-%{version}.
 URL: http://sourceforge.net/projects/l2tpns
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig
 URL: http://sourceforge.net/projects/l2tpns
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig

-BuildRequires: libcli >= 1.8.1
-Requires: libcli >= 1.8.1
+BuildRequires: libcli >= 1.8.2
+Requires: libcli >= 1.8.2

 
 %description
 A L2TP LNS which does not require l2tpd, pppd or any kernel patches. Can support
 
 %description
 A L2TP LNS which does not require l2tpd, pppd or any kernel patches. Can support