diff options
| author | Everton Marques <everton.marques@gmail.com> | 2014-09-18 12:06:53 -0300 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2015-02-04 06:08:00 +0100 |
| commit | 74b4fad93e89df358441b1b3b23282aaca8c80b8 (patch) | |
| tree | 1baaf3d2173cb33fa44c3dae4b45d0720479367d | |
| parent | 3d62667ab0e8e7ee6e17e883b144e25ee84c4545 (diff) | |
| download | quagga-74b4fad93e89df358441b1b3b23282aaca8c80b8.tar.bz2 quagga-74b4fad93e89df358441b1b3b23282aaca8c80b8.tar.xz | |
pimd: Remove motd tweaking.
| -rw-r--r-- | lib/command.c | 2 | ||||
| -rw-r--r-- | pimd/Makefile.am | 2 | ||||
| -rw-r--r-- | pimd/pim_main.c | 13 |
3 files changed, 1 insertions, 16 deletions
diff --git a/lib/command.c b/lib/command.c index a789b0f4..8870a421 100644 --- a/lib/command.c +++ b/lib/command.c @@ -105,7 +105,7 @@ static struct cmd_node config_node = }; /* Default motd string. */ -const char *default_motd = +static const char *default_motd = "\r\n\ Hello, this is " QUAGGA_PROGNAME " (version " QUAGGA_VERSION ").\r\n\ " QUAGGA_COPYRIGHT "\r\n\ diff --git a/pimd/Makefile.am b/pimd/Makefile.am index 9345460d..3b8a0e17 100644 --- a/pimd/Makefile.am +++ b/pimd/Makefile.am @@ -21,7 +21,6 @@ # PIM_DEBUG_BYDEFAULT: Automatically enables all pimd "debug ..." commands # PIM_ZCLIENT_DEBUG: Support for internal ZEBRA client debugging -# PIM_MOTD_VERSION: Includes pimd version in default MOTD # PIM_CHECK_RECV_IFINDEX_SANITY: Compare socket ifindex with recv ifindex # PIM_REPORT_RECV_IFINDEX_MISMATCH: Report sock/recv ifindex mismatch # PIM_ENFORCE_LOOPFREE_MFC: Refuse adding looping MFC entries @@ -34,7 +33,6 @@ PIM_DEFS = PIM_DEFS += -DPIM_CHECK_RECV_IFINDEX_SANITY #PIM_DEFS += -DPIM_REPORT_RECV_IFINDEX_MISMATCH PIM_DEFS += -DPIM_ZCLIENT_DEBUG -PIM_DEFS += -DPIM_MOTD_VERSION PIM_DEFS += -DPIM_ENFORCE_LOOPFREE_MFC #PIM_DEFS += -DPIM_UNEXPECTED_KERNEL_UPCALL #PIM_DEFS += -DPIM_USE_QUAGGA_GETTIME diff --git a/pimd/pim_main.c b/pimd/pim_main.c index 768ac08c..68cfe218 100644 --- a/pimd/pim_main.c +++ b/pimd/pim_main.c @@ -46,7 +46,6 @@ extern int zclient_debug; #endif extern struct host host; -extern const char *default_motd; char config_default[] = SYSCONFDIR PIMD_DEFAULT_CONFIG; @@ -246,18 +245,6 @@ int main(int argc, char** argv, char** envp) { zlog_notice("Quagga %s " PIMD_PROGNAME " %s starting, VTY interface at port TCP %d", QUAGGA_VERSION, PIMD_VERSION, vty_port); -#ifdef PIM_MOTD_VERSION - /* Tweak default MOTD to include pimd version */ - zlog_notice("PIM_MOTD_VERSION: adding pimd version to default MOTD"); - if (host.motd == default_motd) { - host.motd = - "\r\n\ -Hello, this is " QUAGGA_PROGNAME " " QUAGGA_VERSION " " PIMD_PROGNAME " " PIMD_VERSION_STR "\r\n\ -" QUAGGA_COPYRIGHT "\r\n\ -\r\n"; - } -#endif - #ifdef PIM_DEBUG_BYDEFAULT zlog_notice("PIM_DEBUG_BYDEFAULT: Enabling all debug commands"); PIM_DO_DEBUG_PIM_EVENTS; |