Index: vfs_mount.c
===================================================================
RCS file: /private/FreeBSD/src/sys/kern/vfs_mount.c,v
retrieving revision 1.121
diff -u -p -r1.121 vfs_mount.c
--- vfs_mount.c	16 Mar 2004 08:59:36 -0000	1.121
+++ vfs_mount.c	26 Mar 2004 20:55:43 -0000
@@ -696,10 +696,12 @@ vfs_domount(
 	}
 	/*
 	 * Silently enforce MNT_NOSUID, MNT_NODEV and MNT_USER
-	 * for unprivileged users.
+	 * for unprivileged users and remove MNT_SUIDDIR.
 	 */
-	if (suser(td))
+	if (suser(td)) {
+		fsflags &= ~MNT_SUIDDIR;
 		fsflags |= MNT_NOSUID | MNT_NODEV | MNT_USER;
+	}
 	/*
 	 * Get vnode to be covered
 	 */