bgpd, ripd, ripngd: remove deprecated -r option

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index adba73e404659198a29c224bef0f0bffb7738589..abd8586f4c71d73ed392e32a3ba9c1ea17e10cfc 100644 (file)
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -70,10 +70,6 @@
 static const struct option longopts[] = {
        {"bgp_port", required_argument, NULL, 'p'},
        {"listenon", required_argument, NULL, 'l'},
-#if CONFDATE > 20190521
-       CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
-#endif
-       {"retain", no_argument, NULL, 'r'},
        {"no_kernel", no_argument, NULL, 'n'},
        {"skip_runas", no_argument, NULL, 'S'},
        {"ecmp", required_argument, NULL, 'e'},
@@ -367,10 +363,7 @@ FRR_DAEMON_INFO(bgpd, BGP, .vty_port = BGP_VTY_PORT,
                .privs = &bgpd_privs, .yang_modules = bgpd_yang_modules,
                .n_yang_modules = array_size(bgpd_yang_modules), )
 
-#if CONFDATE > 20190521
-CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
-#endif
-#define DEPRECATED_OPTIONS "r"
+#define DEPRECATED_OPTIONS ""
 
 /* Main routine of bgpd. Treatment of argument and start bgp finite
    state machine is handled at here. */

diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index 65da51f83abd066e52ea130fa6726a1bae828f80..773cb1d0fe6efabc88c8faa6d1c037bc21132fcb 100644 (file)
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -41,10 +41,7 @@
 #include "ripd/rip_errors.h"
 
 /* ripd options. */
-#if CONFDATE > 20190521
-       CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
-#endif
-static struct option longopts[] = {{"retain", no_argument, NULL, 'r'}, {0}};
+static struct option longopts[] = {{0}};
 
 /* ripd privileges */
 zebra_capabilities_t _caps_p[] = {ZCAP_NET_RAW, ZCAP_BIND, ZCAP_SYS_ADMIN};
@@ -129,10 +126,7 @@ FRR_DAEMON_INFO(ripd, RIP, .vty_port = RIP_VTY_PORT,
                .privs = &ripd_privs, .yang_modules = ripd_yang_modules,
                .n_yang_modules = array_size(ripd_yang_modules), )
 
-#if CONFDATE > 20190521
-CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
-#endif
-#define DEPRECATED_OPTIONS "r"
+#define DEPRECATED_OPTIONS ""
 
 /* Main routine of ripd. */
 int main(int argc, char **argv)

diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index c755bd83ce5c4d757e2bb80644f18c982375d13e..4b027019c0977018920a133f28ef10e24a6f1671 100644 (file)
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -41,10 +41,7 @@
 #include "ripngd/ripngd.h"
 
 /* RIPngd options. */
-#if CONFDATE > 20190521
-       CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
-#endif
-struct option longopts[] = {{"retain", no_argument, NULL, 'r'}, {0}};
+struct option longopts[] = {{0}};
 
 /* ripngd privileges */
 zebra_capabilities_t _caps_p[] = {ZCAP_NET_RAW, ZCAP_BIND, ZCAP_SYS_ADMIN};
@@ -132,10 +129,7 @@ FRR_DAEMON_INFO(ripngd, RIPNG, .vty_port = RIPNG_VTY_PORT,
                .yang_modules = ripngd_yang_modules,
                .n_yang_modules = array_size(ripngd_yang_modules), )
 
-#if CONFDATE > 20190521
-CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
-#endif
-#define DEPRECATED_OPTIONS "r"
+#define DEPRECATED_OPTIONS ""
 
 /* RIPngd main routine. */
 int main(int argc, char **argv)