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 /zebra/main.c | |
| parent | 01cb1466423363a2f8b42246464feb3858df1c9f (diff) | |
| parent | 5551c072e187c76c3d6a885cd043d6db811bab23 (diff) | |
Merge remote-tracking branch 'origin/master' into pim_lib_work2
Diffstat (limited to 'zebra/main.c')
| -rw-r--r-- | zebra/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/zebra/main.c b/zebra/main.c index 4fea0104f5..9abc8f87ff 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -111,9 +111,9 @@ zebra_capabilities_t _caps_p [] = /* zebra privileges to run with */ struct zebra_privs_t zserv_privs = { -#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP) - .user = QUAGGA_USER, - .group = QUAGGA_GROUP, +#if defined(FRR_USER) && defined(FRR_GROUP) + .user = FRR_USER, + .group = FRR_GROUP, #endif #ifdef VTY_GROUP .vty_group = VTY_GROUP, @@ -162,7 +162,7 @@ usage (char *progname, int status) printf ("-v, --version Print program version\n"\ "-h, --help Display this help and exit\n"\ "\n"\ - "Report bugs to %s\n", ZEBRA_BUG_ADDRESS); + "Report bugs to %s\n", FRR_BUG_ADDRESS); } exit (status); @@ -466,7 +466,7 @@ main (int argc, char **argv) vty_serv_sock (vty_addr, vty_port, ZEBRA_VTYSH_PATH); /* Print banner. */ - zlog_notice ("Zebra %s starting: vty@%d", QUAGGA_VERSION, vty_port); + zlog_notice ("Zebra %s starting: vty@%d", FRR_VERSION, vty_port); while (thread_fetch (zebrad.master, &thread)) thread_call (&thread); |