From: Stephen Hemminger <shemminger@vyatta.com>
Date: Thu, 10 Dec 2009 17:19:09 +0000 (+0000)
Subject: vty_serv_sock_family unused
X-Git-Tag: frr-2.0-rc1~1918^2~52
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ba1a944aa7adffd9194ef0ad61649fe3e02b0f38;p=mirror%2Ffrr.git

vty_serv_sock_family unused

If the vty_serv_sock_addrinfo is being used, then vty_serv_sock_family
is unsed. Fix by adjusting ifdef/else/endif
---

diff --git a/lib/vty.c b/lib/vty.c
index 4fed271156..83bd6785fc 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -1839,7 +1839,7 @@ vty_serv_sock_addrinfo (const char *hostname, unsigned short port)
 
   freeaddrinfo (ainfo_save);
 }
-#endif /* HAVE_IPV6 && ! NRL */
+#else /* HAVE_IPV6 && ! NRL */
 
 /* Make vty server socket. */
 static void
@@ -1905,6 +1905,7 @@ vty_serv_sock_family (const char* addr, unsigned short port, int family)
   /* Add vty server event. */
   vty_event (VTY_SERV, accept_sock, NULL);
 }
+#endif /* HAVE_IPV6 && ! NRL */
 
 #ifdef VTYSH
 /* For sockaddr_un. */