2006-01-11 Erik Smit <zoiah@zoiah.net>

	* vtysh.c: (vtysh_config_from_file) fix regression from
	  a previous cleanup, vtysh_client.flags and cmd->daemon are
	  bitwise flags, bitwise & was meant to be used. Fixes breakage
	  of integrated config file reading.

diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index 9e4e40ad586fbc19bf9cb993d94e7733ee488fba..11192c1f72ad7b4f464bfb36c64358e24f5814c6 100644 (file)
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-11 Erik Smit <zoiah@zoiah.net>
+
+       * vtysh.c: (vtysh_config_from_file) fix regression from
+         a previous cleanup, vtysh_client.flags and cmd->daemon are
+         bitwise flags, bitwise & was meant to be used. Fixes breakage
+         of integrated config file reading.
+
 2005-09-15 Hasso Tepper <hasso at quagga.net>
 
        * vtysh.c: Fix warning by casting rl_bind_key 2. argument correctly.

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index fa48a44eaaf3606a56a9536d5c84358c61a08bf1..08ed7498733c3da2fd2f6524ee94d1a626fc7461 100644 (file)
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -523,7 +523,7 @@ vtysh_config_from_file (struct vty *vty, FILE *fp)
 
            for (i = 0; i < VTYSH_INDEX_MAX; i++)
              {
-               if (cmd->daemon && vtysh_client[i].flag)
+               if (cmd->daemon & vtysh_client[i].flag)
                  {
                    cmd_stat = vtysh_client_execute (&vtysh_client[i],
                                                     vty->buf, stdout);