diff -r 344f66bc6777 usr/src/cmd/fs.d/nfs/umount/umount.c
--- a/usr/src/cmd/fs.d/nfs/umount/umount.c	Sun Sep 02 22:24:27 2007 -0700
+++ b/usr/src/cmd/fs.d/nfs/umount/umount.c	Mon Sep 10 21:09:08 2007 -0500
@@ -75,7 +75,7 @@ static	int	nfs_unmount(char *, int);
 static	int	nfs_unmount(char *, int);
 static	void	inform_server(char *, char *, bool_t);
 static	struct extmnttab *mnttab_find();
-extern int __clnt_bindresvport();
+extern int __clnt_bindresvport(CLIENT *cl);
 
 static	int is_v4_mount(struct extmnttab *);
 
@@ -98,7 +98,7 @@ main(int argc, char *argv[])
 
 	myname = strrchr(argv[0], '/');
 	myname = myname ? myname+1 : argv[0];
-	(void) sprintf(typename, "nfs %s", myname);
+	(void) snprintf(typename, strlen(typename), "nfs %s", myname);
 	argv[0] = typename;
 
 	/*
@@ -154,7 +154,7 @@ usage()
 usage()
 {
 	(void) fprintf(stderr,
-	    gettext("Usage: nfs umount [-o opts] {server:path | dir}\n"));
+	    gettext("Usage: nfs umount [-f opts] {server:path | dir}\n"));
 	exit(RET_ERR);
 }
 
@@ -226,7 +226,7 @@ mnttab_find(dirname)
 		}
 	}
 
-	fclose(fp);
+	(void) fclose(fp);
 	return (res);
 }
 
@@ -361,7 +361,6 @@ is_v4_mount(struct extmnttab *mntp)
 {
 	kstat_ctl_t *kc = NULL;		/* libkstat cookie */
 	kstat_t *ksp;
-	ulong_t fsid;
 	struct mntinfo_kstat mik;
 
 	if (mntp == NULL)
diff -r 344f66bc6777 usr/src/lib/librpcsvc/Makefile.com
--- a/usr/src/lib/librpcsvc/Makefile.com	Sun Sep 02 22:24:27 2007 -0700
+++ b/usr/src/lib/librpcsvc/Makefile.com	Mon Sep 10 21:05:20 2007 -0500
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"@(#)Makefile.com	1.15	06/08/02 SMI"
 #
 
 LIBRARY= librpcsvc.a
@@ -45,9 +45,12 @@ pics/%.o: ../common/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
 
-LIBS = $(DYNLIB)
+LIBS = $(DYNLIB) $(LINTLIB)
 
 CPPFLAGS += -DYP
+
+$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC)
+
 LDLIBS += -lnsl -lc
 
 .KEEP_STATE:
diff -r 344f66bc6777 usr/src/lib/librpcsvc/common/llib-lrpcsvc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/librpcsvc/common/llib-lrpcsvc	Mon Sep 10 21:05:03 2007 -0500
@@ -0,0 +1,45 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*LINTLIBRARY*/
+/*PROTOLIB1*/
+
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"@(#)llib-lrpcsvc	1.1	09/07/07"
+
+/* LINTLIBRARY */
+/* PROTOLIB1 */
+
+#include <rpcsvc/autofs_prot.h>
+#include <rpcsvc/bootparam_prot.h>
+#include <rpcsvc/mount.h>
+#include <rpcsvc/nfs4_prot.h>
+#include <rpcsvc/nlm_prot.h>
+#include <rpcsvc/rpc_sztypes.h>
+#include <rpcsvc/rstat.h>
+#include <rpcsvc/ufs_prot.h>
+
+extern int __clnt_bindresvport(CLIENT *cl);
+