diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-06 09:58:21 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-01-06 09:58:21 -0500 |
| commit | 3b14d86eed3c042db718c7e006ca5299f473c88e (patch) | |
| tree | 4efde6b2d77f5229ace3375da3471b0db1daa695 /ospf6d/ospf6_main.c | |
| parent | 0b0038b8bcf84beda44fb69a60b2620b0387d8e8 (diff) | |
| parent | 7d53a49360ddceb16db34bc8a84039cb2ecab22c (diff) | |
Merge remote-tracking branch 'origin/stable/2.0'
Diffstat (limited to 'ospf6d/ospf6_main.c')
| -rw-r--r-- | ospf6d/ospf6_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index 11a77059be..bd3a2faa5d 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -63,11 +63,11 @@ zebra_capabilities_t _caps_p [] = struct zebra_privs_t ospf6d_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, @@ -131,7 +131,7 @@ Daemon which manages OSPF version 3.\n\n\ -C, --dryrun Check configuration for validity and exit\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); @@ -361,7 +361,7 @@ main (int argc, char *argv[], char *envp[]) /* Print start message */ zlog_notice ("OSPF6d (Quagga-%s ospf6d-%s) starts: vty@%d", - QUAGGA_VERSION, OSPF6_DAEMON_VERSION,vty_port); + FRR_VERSION, OSPF6_DAEMON_VERSION,vty_port); /* Start finite state machine, here we go! */ while (thread_fetch (master, &thread)) |