diff options
| author | Quentin Young <qlyoung@users.noreply.github.com> | 2017-01-06 19:44:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-06 19:44:46 -0500 |
| commit | b84aadae447e1d5e534d2d46e3922f47c316d107 (patch) | |
| tree | aba0baabd2a34ec52b5f8a37db92bec576d53e4a /pimd/pim_main.c | |
| parent | 6d681bd874dc7dee4300a5d3a5ced8bb1a679643 (diff) | |
| parent | 40bfb7248f016b8c7862a188fe8f448ddccb9ecc (diff) | |
Merge branch 'master' into fix-proto_redistnum
Diffstat (limited to 'pimd/pim_main.c')
| -rw-r--r-- | pimd/pim_main.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pimd/pim_main.c b/pimd/pim_main.c index aa3db3d5b2..29432ea230 100644 --- a/pimd/pim_main.c +++ b/pimd/pim_main.c @@ -16,8 +16,6 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include <zebra.h> @@ -77,9 +75,9 @@ zebra_capabilities_t _caps_p [] = /* pimd privileges to run with */ struct zebra_privs_t pimd_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, @@ -176,7 +174,7 @@ int main(int argc, char** argv, char** envp) { break; case 'v': printf(PIMD_PROGNAME " version %s\n", PIMD_VERSION); - print_version(QUAGGA_PROGNAME); + print_version(progname); exit (0); break; #ifdef PIM_ZCLIENT_DEBUG @@ -196,7 +194,7 @@ int main(int argc, char** argv, char** envp) { master = thread_master_create(); zlog_notice("Quagga %s " PIMD_PROGNAME " %s starting", - QUAGGA_VERSION, PIMD_VERSION); + FRR_VERSION, PIMD_VERSION); /* * Initializations @@ -243,7 +241,7 @@ int main(int argc, char** argv, char** envp) { vty_serv_sock(vty_addr, vty_port, PIM_VTYSH_PATH); zlog_notice("Quagga %s " PIMD_PROGNAME " %s starting, VTY interface at port TCP %d", - QUAGGA_VERSION, PIMD_VERSION, vty_port); + FRR_VERSION, PIMD_VERSION, vty_port); #ifdef PIM_DEBUG_BYDEFAULT zlog_notice("PIM_DEBUG_BYDEFAULT: Enabling all debug commands"); |