Second tranche of updates for pipework branch.

	modified:   bgpd/bgp_connection.c
	modified:   bgpd/bgp_debug.c
	modified:   bgpd/bgp_engine.h
	modified:   bgpd/bgp_main.c
	modified:   bgpd/bgp_packet.c
	modified:   bgpd/bgp_peer.c
	modified:   bgpd/bgp_route.c
	modified:   bgpd/bgp_routemap.c
	modified:   bgpd/bgp_session.c
	modified:   bgpd/bgp_vty.c
	modified:   bgpd/bgpd.c
	modified:   bgpd/bgpd.h
	modified:   configure.ac
	modified:   isisd/dict.h
	modified:   isisd/isis_misc.c
	modified:   isisd/isis_routemap.c
	modified:   isisd/isis_spf.c
	modified:   lib/Makefile.am
	modified:   lib/command.c
	modified:   lib/command.h
	modified:   lib/command_execute.h
	modified:   lib/command_parse.c
	modified:   lib/command_parse.h
	modified:   lib/command_queue.c
	modified:   lib/command_queue.h
	modified:   lib/elstring.h
	modified:   lib/heap.c
	modified:   lib/if.c
	modified:   lib/if.h
	modified:   lib/keychain.c
	modified:   lib/keystroke.c
	modified:   lib/keystroke.h
	modified:   lib/list_util.c
	modified:   lib/list_util.h
	modified:   lib/log.c
	modified:   lib/log.h
	modified:   lib/memory.c
	modified:   lib/memory.h
	modified:   lib/memtypes.c
	modified:   lib/misc.h
	modified:   lib/mqueue.c
	modified:   lib/mqueue.h
	deleted:    lib/node_type.h
	modified:   lib/pthread_safe.c
	modified:   lib/qfstring.c
	modified:   lib/qiovec.c
	modified:   lib/qiovec.h
	modified:   lib/qpath.c
	modified:   lib/qpnexus.c
	modified:   lib/qpnexus.h
	modified:   lib/qpselect.c
	modified:   lib/qpthreads.h
	modified:   lib/qstring.c
	modified:   lib/qstring.h
	modified:   lib/qtime.c
	modified:   lib/qtime.h
	modified:   lib/qtimers.c
	modified:   lib/qtimers.h
	modified:   lib/routemap.c
	modified:   lib/symtab.h
	modified:   lib/thread.h
	deleted:    lib/uty.h
	modified:   lib/vector.c
	modified:   lib/vector.h
	modified:   lib/version.h.in
	modified:   lib/vio_fifo.c
	modified:   lib/vio_fifo.h
	modified:   lib/vio_lines.c
	modified:   lib/vio_lines.h
	modified:   lib/vty.c
	modified:   lib/vty.h
	modified:   lib/vty_cli.c
	modified:   lib/vty_cli.h
	modified:   lib/vty_io.c
	modified:   lib/vty_io.h
	modified:   lib/vty_io_basic.c
	modified:   lib/vty_io_basic.h
	modified:   lib/vty_io_file.c
	modified:   lib/vty_io_file.h
	modified:   lib/vty_io_shell.c
	modified:   lib/vty_io_term.c
	modified:   lib/vty_io_term.h
	modified:   lib/vty_local.h
	modified:   lib/vty_pipe.c
	modified:   lib/workqueue.h
	modified:   lib/zebra.h
	modified:   ospf6d/ospf6_lsa.c
	modified:   ripngd/ripngd.c
	modified:   tests/test-list_util.c
	modified:   tests/test-vector.c
	modified:   vtysh/vtysh.c
	modified:   vtysh/vtysh_config.c

1 files changed, 13 insertions, 9 deletions

diff --git a/lib/keychain.c b/lib/keychain.c
index 2f8a0b77..57ccf7cc 100644
--- a/lib/keychain.c
+++ b/lib/keychain.c
@@ -238,7 +238,7 @@ DEFUN (key_chain,
 
   keychain = keychain_get (argv[0]);
   vty->index = keychain;
-  vty_set_node(vty, KEYCHAIN_NODE) ;
+  vty->node  = KEYCHAIN_NODE ;
 
   return CMD_SUCCESS;
 }
@@ -281,7 +281,7 @@ DEFUN (key,
   VTY_GET_INTEGER ("key identifier", index, argv[0]);
   key = key_get (keychain, index);
   vty->index_sub = key;
-  vty_set_node(vty, KEYCHAIN_KEY_NODE) ;
+  vty->node = KEYCHAIN_KEY_NODE ;
 
   return CMD_SUCCESS;
 }
@@ -309,7 +309,7 @@ DEFUN (no_key,
 
   key_delete (keychain, key);
 
-  vty_set_node(vty, KEYCHAIN_NODE) ;
+  vty->node = KEYCHAIN_NODE ;
 
   return CMD_SUCCESS;
 }
@@ -850,16 +850,20 @@ DEFUN (send_lifetime_duration_month_day,
 
 static struct cmd_node keychain_node =
 {
-  KEYCHAIN_NODE,
-  "%s(config-keychain)# ",
-  1
+  .node   = KEYCHAIN_NODE,
+  .prompt ="%s(config-keychain)# ",
+
+  .config_to_vtysh = true
 };
 
 static struct cmd_node keychain_key_node =
 {
-  KEYCHAIN_KEY_NODE,
-  "%s(config-keychain-key)# ",
-  1
+  .node   = KEYCHAIN_KEY_NODE,
+  .prompt = "%s(config-keychain-key)# ",
+
+  .parent = KEYCHAIN_NODE,
+
+  .config_to_vtysh = true
 };
 
 static int