From: paul <paul>
Date: Wed, 11 Jan 2006 01:38:25 +0000 (+0000)
Subject: 2006-01-11 Erik Smit <zoiah@zoiah.net>
X-Git-Tag: frr-2.0-rc1~2797
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=44316fef4d93b3d94cf45663ce35797d32acce71;p=matthieu%2Ffrr.git

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 9e4e40ad58..11192c1f72 100644
--- 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 fa48a44eaa..08ed749873 100644
--- 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);