summaryrefslogtreecommitdiffstats
path: root/vtysh
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-02-07 19:20:12 +0100
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-02-07 19:20:12 +0100
commit7df2e1c3797df638016ae6d7a34e1781c0f1ced5 (patch)
tree2c7aa125a2e684ce5e2d91b37e4fc1e4dab7b024 /vtysh
parentMerge pull request #174 from LabNConsulting/working/master/patch-set/issue-172 (diff)
parentMerge pull request #176 from opensourcerouting/mtype-underflow-backtrace (diff)
downloadfrr-7df2e1c3797df638016ae6d7a34e1781c0f1ced5.tar.xz
frr-7df2e1c3797df638016ae6d7a34e1781c0f1ced5.zip
Merge remote-tracking branch 'origin/stable/2.0'
Diffstat (limited to 'vtysh')
-rw-r--r--vtysh/Makefile.am2
-rw-r--r--vtysh/vtysh.h2
-rw-r--r--vtysh/vtysh_main.c8
3 files changed, 6 insertions, 6 deletions
diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am
index f689bae5c..376f380a3 100644
--- a/vtysh/Makefile.am
+++ b/vtysh/Makefile.am
@@ -30,7 +30,7 @@ vtysh_SOURCES = vtysh_main.c vtysh.c vtysh_user.c vtysh_config.c
nodist_vtysh_SOURCES = vtysh_cmd.c
CLEANFILES = vtysh_cmd.c
noinst_HEADERS = vtysh.h vtysh_user.h
-vtysh_LDADD = ../lib/libzebra.la @LIBCAP@ @LIBREADLINE@
+vtysh_LDADD = ../lib/libfrr.la @LIBCAP@ @LIBREADLINE@
examplesdir = $(exampledir)
dist_examples_DATA = vtysh.conf.sample
diff --git a/vtysh/vtysh.h b/vtysh/vtysh.h
index 537f944a7..39bf64f30 100644
--- a/vtysh/vtysh.h
+++ b/vtysh/vtysh.h
@@ -49,7 +49,7 @@ DECLARE_MGROUP(MVTYSH)
/* vtysh local configuration file. */
#define VTYSH_DEFAULT_CONFIG "vtysh.conf"
-#define QUAGGA_DEFAULT_CONFIG "Quagga.conf"
+#define FRR_DEFAULT_CONFIG "Frr.conf"
enum vtysh_write_integrated {
WRITE_INTEGRATED_UNSPECIFIED,
diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index 78b17be05..127cb70ad 100644
--- a/vtysh/vtysh_main.c
+++ b/vtysh/vtysh_main.c
@@ -46,7 +46,7 @@ char *progname;
/* Configuration file name and directory. */
static char vtysh_config_always[MAXPATHLEN] = SYSCONFDIR VTYSH_DEFAULT_CONFIG;
-static char quagga_config_default[MAXPATHLEN] = SYSCONFDIR QUAGGA_DEFAULT_CONFIG;
+static char quagga_config_default[MAXPATHLEN] = SYSCONFDIR FRR_DEFAULT_CONFIG;
char *quagga_config = quagga_config_default;
char history_file[MAXPATHLEN];
@@ -357,17 +357,17 @@ main (int argc, char **argv, char **env)
/*
* Overwrite location for Quagga.conf
*/
- vtysh_configfile_name = strrchr(QUAGGA_DEFAULT_CONFIG, '/');
+ vtysh_configfile_name = strrchr(FRR_DEFAULT_CONFIG, '/');
if (vtysh_configfile_name)
/* skip '/' */
vtysh_configfile_name++;
else
/*
- * QUAGGA_DEFAULT_CONFIG configured with relative path
+ * FRR_DEFAULT_CONFIG configured with relative path
* during config? Should really never happen for
* sensible config
*/
- vtysh_configfile_name = (char *) QUAGGA_DEFAULT_CONFIG;
+ vtysh_configfile_name = (char *) FRR_DEFAULT_CONFIG;
strlcpy(quagga_config_default, optarg, sizeof(vtysh_config_always));
strlcat(quagga_config_default, "/", sizeof(vtysh_config_always));
strlcat(quagga_config_default, vtysh_configfile_name,