1 files changed, 3 insertions, 0 deletions
diff --git a/lib/vty.c b/lib/vty.c
index c965c7b4..a76fe2d1 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -712,6 +712,7 @@ vty_end_config (struct vty *vty)
     case KEYCHAIN_NODE:
     case KEYCHAIN_KEY_NODE:
     case MASC_NODE:
+    case PIM_NODE:
     case VTY_NODE:
       vty_config_unlock (vty);
       vty->node = ENABLE_NODE;
@@ -1115,6 +1116,7 @@ vty_stop_input (struct vty *vty)
     case KEYCHAIN_NODE:
     case KEYCHAIN_KEY_NODE:
     case MASC_NODE:
+    case PIM_NODE:
     case VTY_NODE:
       vty_config_unlock (vty);
       vty->node = ENABLE_NODE;
@@ -1816,6 +1818,7 @@ vty_serv_sock_addrinfo (const char *hostname, unsigned short port)
       if (sock < 0)
 	continue;
 
+      sockopt_v6only (ainfo->ai_family, sock);
       sockopt_reuseaddr (sock);
       sockopt_reuseport (sock);