diff options
| author | Emanuele Di Pascale <emanuele@voltanet.io> | 2019-05-22 17:42:40 +0200 |
|---|---|---|
| committer | Emanuele Di Pascale <emanuele@voltanet.io> | 2019-05-22 17:42:40 +0200 |
| commit | f28963f7454ef0fba12f6ed310fec0fb57531665 (patch) | |
| tree | 123d35964c4bd3f45b95f8aaa22e64e71f8a3c29 /ripd | |
| parent | Merge pull request #4359 from adharkar/frr-master-rtm_vxlan (diff) | |
| download | frr-f28963f7454ef0fba12f6ed310fec0fb57531665.tar.xz frr-f28963f7454ef0fba12f6ed310fec0fb57531665.zip | |
bgpd, ripd, ripngd: remove deprecated -r option
Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
Diffstat (limited to 'ripd')
| -rw-r--r-- | ripd/rip_main.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ripd/rip_main.c b/ripd/rip_main.c index 65da51f83..773cb1d0f 100644 --- 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) |