--- xnu/xnu-517/bsd/dev/random/randomdev.c
+++ xnu/xnu-201/bsd/dev/random/randomdev.c
@@ -1,24 +1,21 @@
 /*
- * Copyright (c) 1999, 2000-2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999, 2000-2001 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -32,6 +29,8 @@
 #include <sys/fcntl.h>
 #include <miscfs/devfs/devfs.h>
 #include <kern/lock.h>
+#include <kern/task.h>
+#include <kern/thread.h>
 #include <sys/time.h>
 #include <sys/malloc.h>
 
@@ -39,8 +38,6 @@
 #include <dev/random/YarrowCoreLib/include/yarrow.h>
 
 #define RANDOM_MAJOR  -1 /* let the kernel pick the device number */
-
-d_ioctl_t       random_ioctl;
 
 /*
  * A struct describing which functions will get invoked for certain
@@ -52,7 +49,7 @@
 	random_close,		/* close */
 	random_read,		/* read */
 	random_write,		/* write */
-	random_ioctl,			/* ioctl */
+	eno_ioctl,			/* ioctl */
 	nulldev,			/* stop */
 	nulldev,			/* reset */
 	NULL,				/* tty's */
@@ -144,33 +141,14 @@
 	}
 
 	devfs_make_node(makedev (ret, 0), DEVFS_CHAR,
-		UID_ROOT, GID_WHEEL, 0666, "random", 0);
+		UID_ROOT, GID_WHEEL, 0644, "random", 0);
 
 	/*
 	 * also make urandom 
 	 * (which is exactly the same thing in our context)
 	 */
 	devfs_make_node(makedev (ret, 1), DEVFS_CHAR,
-		UID_ROOT, GID_WHEEL, 0666, "urandom", 0);
-}
-
-int
-random_ioctl(dev, cmd, data, flag, p)
-        dev_t dev;
-        u_long cmd;
-        caddr_t data;
-        int flag;
-        struct proc *p;
-{
-	switch (cmd) {
-	case FIONBIO:
-	case FIOASYNC:
-		break;
-	default:
-		return ENODEV;
-	}
-
-	return (0);
+		UID_ROOT, GID_WHEEL, 0644, "urandom", 0);
 }
 
 /*
@@ -193,10 +171,8 @@
 	if (flags & FWRITE) {
 		if (securelevel >= 2)
 			return (EPERM);
-#ifndef __APPLE__
 		if ((securelevel >= 1) && suser(p->p_ucred, &p->p_acflag))
 			return (EPERM);
-#endif	/* !__APPLE__ */
 	}
 
 	return (0);