From f361d28a2c43d6bdc86001afa786a5adf3f1abb7 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sat, 14 Jun 1997 11:19:35 +0000
Subject: Don't require superuser privileges for creating fifos.  The v2 case
 was broken when support for v3 was introduced in rev.1.16.  The v3 case has
 always been broken in FreeBSD.

Should be in 2.2.

PR:		3838
---
 sys/nfs/nfs_serv.c       | 7 ++++---
 sys/nfsserver/nfs_serv.c | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index 1f2827a026c9f..f3939867899d3 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c	8.3 (Berkeley) 1/12/94
- * $Id: nfs_serv.c,v 1.42 1997/05/10 16:59:36 dfr Exp $
+ * $Id: nfs_serv.c,v 1.43 1997/06/03 13:56:54 dfr Exp $
  */
 
 /*
@@ -1427,7 +1427,8 @@ nfsrv_create(nfsd, slp, procp, mrq)
 			vap->va_type == VFIFO) {
 			if (vap->va_type == VCHR && rdev == 0xffffffff)
 				vap->va_type = VFIFO;
-			if (error = suser(cred, (u_short *)0)) {
+			if (vap->va_type != VFIFO &&
+			    (error = suser(cred, (u_short *)0))) {
 				vrele(nd.ni_startdir);
 				free(nd.ni_cnd.cn_pnbuf, M_NAMEI);
 				VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
@@ -1621,7 +1622,7 @@ nfsrv_mknod(nfsd, slp, procp, mrq)
 		if (!error)
 			FREE(nd.ni_cnd.cn_pnbuf, M_NAMEI);
 	} else {
-		if (error = suser(cred, (u_short *)0)) {
+		if (vtyp != VFIFO && (error = suser(cred, (u_short *)0))) {
 			vrele(nd.ni_startdir);
 			free((caddr_t)nd.ni_cnd.cn_pnbuf, M_NAMEI);
 			VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index 1f2827a026c9f..f3939867899d3 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c	8.3 (Berkeley) 1/12/94
- * $Id: nfs_serv.c,v 1.42 1997/05/10 16:59:36 dfr Exp $
+ * $Id: nfs_serv.c,v 1.43 1997/06/03 13:56:54 dfr Exp $
  */
 
 /*
@@ -1427,7 +1427,8 @@ nfsrv_create(nfsd, slp, procp, mrq)
 			vap->va_type == VFIFO) {
 			if (vap->va_type == VCHR && rdev == 0xffffffff)
 				vap->va_type = VFIFO;
-			if (error = suser(cred, (u_short *)0)) {
+			if (vap->va_type != VFIFO &&
+			    (error = suser(cred, (u_short *)0))) {
 				vrele(nd.ni_startdir);
 				free(nd.ni_cnd.cn_pnbuf, M_NAMEI);
 				VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
@@ -1621,7 +1622,7 @@ nfsrv_mknod(nfsd, slp, procp, mrq)
 		if (!error)
 			FREE(nd.ni_cnd.cn_pnbuf, M_NAMEI);
 	} else {
-		if (error = suser(cred, (u_short *)0)) {
+		if (vtyp != VFIFO && (error = suser(cred, (u_short *)0))) {
 			vrele(nd.ni_startdir);
 			free((caddr_t)nd.ni_cnd.cn_pnbuf, M_NAMEI);
 			VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
-- 
cgit v1.3