Merge pull request #2474 from donaldsharp/vty_thread_cancel_writes

[mirror_frr.git] / vtysh / vtysh.c

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 65223d02bd4652cdb1d819de65dcd5f6580970c1..309493b13e9fc199d717c445868b967fc8185603 100644 (file)
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -816,7 +816,7 @@ int vtysh_mark_file(const char *filename)
                        vty_out(vty, "%s", vty->buf);
                        break;
                case CMD_SUCCESS_DAEMON: {
-                       int cmd_stat = CMD_SUCCESS;
+                       int cmd_stat;
 
                        vty_out(vty, "%s", vty->buf);
                        cmd_stat = vtysh_client_execute(&vtysh_client[0],
@@ -2645,8 +2645,12 @@ int vtysh_write_config_integrated(void)
        char line[] = "do write terminal\n";
        FILE *fp;
        int fd;
+#ifdef FRR_USER
        struct passwd *pwentry;
+#endif
+#ifdef FRR_GROUP
        struct group *grentry;
+#endif
        uid_t uid = -1;
        gid_t gid = -1;
        struct stat st;