From 9e8df9882c7c3fcc80aba2923cafd8d3188d83ad Mon Sep 17 00:00:00 2001 From: Jafar Al-Gharaibeh Date: Tue, 23 May 2017 13:23:04 -0500 Subject: [PATCH] vtysh: fix a compile error when user/group are disabled If FRR is configured explicilty with --disable-user and --disable-group, FRR_USER and FRR_GROUP will not be defined and can be safely skipped in vtysh. Signed-off-by: Jafar Al-Gharaibeh --- vtysh/vtysh.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 24ac9675e8..17b95707d6 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -2488,6 +2488,7 @@ vtysh_write_config_integrated(void) err++; } +#ifdef FRR_USER pwentry = getpwnam (FRR_USER); if (pwentry) uid = pwentry->pw_uid; @@ -2496,7 +2497,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; @@ -2505,6 +2507,7 @@ vtysh_write_config_integrated(void) printf ("%% Warning: could not look up group \"%s\"\n", FRR_GROUP); err++; } +#endif if (!fstat (fd, &st)) { -- 2.39.5