diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-17 21:01:56 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-17 21:01:56 -0500 |
| commit | b58ed1f8a89ea32c2380bf79057e5333109d72d4 (patch) | |
| tree | a9ead45b8895edce92ab69621a52816b45725e36 /ripd/rip_main.c | |
| parent | 01cb1466423363a2f8b42246464feb3858df1c9f (diff) | |
| parent | 5551c072e187c76c3d6a885cd043d6db811bab23 (diff) | |
Merge remote-tracking branch 'origin/master' into pim_lib_work2
Diffstat (limited to 'ripd/rip_main.c')
| -rw-r--r-- | ripd/rip_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ripd/rip_main.c b/ripd/rip_main.c index 796647c3e5..cfcb60168a 100644 --- a/ripd/rip_main.c +++ b/ripd/rip_main.c @@ -65,11 +65,11 @@ zebra_capabilities_t _caps_p [] = struct zebra_privs_t ripd_privs = { -#if defined(QUAGGA_USER) - .user = QUAGGA_USER, +#if defined(FRR_USER) + .user = FRR_USER, #endif -#if defined QUAGGA_GROUP - .group = QUAGGA_GROUP, +#if defined FRR_GROUP + .group = FRR_GROUP, #endif #ifdef VTY_GROUP .vty_group = VTY_GROUP, @@ -123,7 +123,7 @@ Daemon which manages RIP version 1 and 2.\n\n\ -v, --version Print program version\n\ -h, --help Display this help and exit\n\ \n\ -Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS); +Report bugs to %s\n", progname, FRR_BUG_ADDRESS); } exit (status); @@ -314,7 +314,7 @@ main (int argc, char **argv) vty_serv_sock (vty_addr, vty_port, RIP_VTYSH_PATH); /* Print banner. */ - zlog_notice ("RIPd %s starting: vty@%d", QUAGGA_VERSION, vty_port); + zlog_notice ("RIPd %s starting: vty@%d", FRR_VERSION, vty_port); /* Execute each thread. */ while (thread_fetch (master, &thread)) |