From 49e3600b9cf8494ecdaea20a0fb8c7910e103c9a Mon Sep 17 00:00:00 2001
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 16 Oct 2011 10:00:28 +0000
Subject: [PATCH] Fix ncplist to build with WARNS=6.

Add some const and static keywords to get it all to build. Also add
missing #includes.
---
 usr.bin/ncplist/Makefile  |  2 --
 usr.bin/ncplist/ncplist.c | 12 +++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr.bin/ncplist/Makefile b/usr.bin/ncplist/Makefile
index b5baed47d7b2..8e6d18991a4f 100644
--- a/usr.bin/ncplist/Makefile
+++ b/usr.bin/ncplist/Makefile
@@ -2,8 +2,6 @@
 
 PROG=	ncplist
 
-WARNS?=	0
-
 DPADD=	${LIBNCP} ${LIBIPX}
 LDADD=	-lncp -lipx
 
diff --git a/usr.bin/ncplist/ncplist.c b/usr.bin/ncplist/ncplist.c
index e2c2ce4133c0..947871883f14 100644
--- a/usr.bin/ncplist/ncplist.c
+++ b/usr.bin/ncplist/ncplist.c
@@ -37,6 +37,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/time.h>
 
+#include <grp.h>
+#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -153,7 +155,7 @@ show_serverlist(char *server)
 {
 	int found = 0, connid;
 	struct ncp_bindery_object obj;
-	char *pattern = "*";
+	const char *pattern = "*";
 
 	connid = ncp_get_connid(server, 1);
 	if (connid < 0)
@@ -229,7 +231,7 @@ show_userlist(char *server)
 	return;
 }
 
-void
+static void
 show_queuelist(char *server, char *patt)
 {
 	struct ncp_bindery_object q;
@@ -298,8 +300,8 @@ list_volumes(char *server)
 }
 
 struct ncp_bind_type {
-	u_long	type;
-	char	*name;
+	u_long		type;
+	const char	*name;
 };
 
 static struct ncp_bind_type btypes[] = {
@@ -310,7 +312,7 @@ static struct ncp_bind_type btypes[] = {
 	{0, NULL}
 };
 
-void
+static void
 list_bindery(char *server, char *type, char *patt)
 {
 	struct ncp_bindery_object q;