diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-06-06 17:37:41 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-06-06 17:37:41 +0200 |
| commit | 326452238a0f2610b778678fd639730c7bdd40fb (patch) | |
| tree | fe95eb5109b8c696274e873b4922fc5562c6a64c /vtysh/vtysh.c | |
| parent | Merge pull request #648 from qlyoung/fix-pollfd-stack-overflow (diff) | |
| parent | Merge branch 'frr/pull/672' into stable/3.0 (diff) | |
| download | frr-326452238a0f2610b778678fd639730c7bdd40fb.tar.xz frr-326452238a0f2610b778678fd639730c7bdd40fb.zip | |
Merge branch 'stable/3.0'
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'vtysh/vtysh.c')
| -rw-r--r-- | vtysh/vtysh.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index ecd0b72e7..63a9da57d 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -2586,6 +2586,7 @@ vtysh_write_config_integrated(void) err++; } +#ifdef FRR_USER pwentry = getpwnam (FRR_USER); if (pwentry) uid = pwentry->pw_uid; @@ -2594,7 +2595,8 @@ vtysh_write_config_integrated(void) printf ("%% Warning: could not look up user \"%s\"\n", FRR_USER); err++; } - +#endif +#ifdef FRR_GROUP grentry = getgrnam (FRR_GROUP); if (grentry) gid = grentry->gr_gid; @@ -2603,6 +2605,7 @@ vtysh_write_config_integrated(void) printf ("%% Warning: could not look up group \"%s\"\n", FRR_GROUP); err++; } +#endif if (!fstat (fd, &st)) { |