Kill XNS.

While we're at it, fix socreate() to take a process argument.  (This
was supposed to get committed days ago...)

2 files changed, 6 insertions, 4 deletions

diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index cbda277..0f9c8c1 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.3 (Berkeley) 1/12/94
- * $Id: nfs_socket.c,v 1.13 1995/12/17 21:12:25 phk Exp $
+ * $Id: nfs_socket.c,v 1.14 1996/01/13 23:27:52 phk Exp $
  */
 
 /*
@@ -192,14 +192,16 @@ nfs_connect(nmp, rep)
 	struct sockaddr_in *sin;
 	struct mbuf *m;
 	u_short tport;
+	struct proc *p = &proc0; /* only used for socreate */
 
 	nmp->nm_so = (struct socket *)0;
 	saddr = mtod(nmp->nm_nam, struct sockaddr *);
 	error = socreate(saddr->sa_family, &nmp->nm_so, nmp->nm_sotype,
-		nmp->nm_soproto);
+		nmp->nm_soproto, p);
 	if (error)
 		goto bad;
 	so = nmp->nm_so;
+	so->so_state &= ~SS_PRIV; /* don't need it */
 	nmp->nm_soflags = so->so_proto->pr_flags;
 
 	/*
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index df4a562..e19c8e6 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_vfsops.c,v 1.25 1995/12/22 15:57:38 phk Exp $
+ * $Id: nfs_vfsops.c,v 1.26 1995/12/28 21:56:49 phk Exp $
  */
 
 #include <sys/param.h>
@@ -343,7 +343,7 @@ nfs_mountroot()
 	 * Do enough of ifconfig(8) so that the critical net interface can
 	 * talk to the server.
 	 */
-	error = socreate(nd->myif.ifra_addr.sa_family, &so, SOCK_DGRAM, 0);
+	error = socreate(nd->myif.ifra_addr.sa_family, &so, SOCK_DGRAM, 0, p);
 	if (error)
 		panic("nfs_mountroot: socreate(%04x): %d",
 			nd->myif.ifra_addr.sa_family, error);