Remove srandomdev fallback code

4 files changed, 14 insertions, 16 deletions

diff --git a/usr.sbin/ppp/chap.c b/usr.sbin/ppp/chap.c
index 0ca0c7f..681d95e 100644
--- a/usr.sbin/ppp/chap.c
+++ b/usr.sbin/ppp/chap.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: chap.c,v 1.17 1997/05/26 00:43:56 brian Exp $
+ * $Id: chap.c,v 1.18 1997/06/09 03:27:15 brian Exp $
  *
  *	TODO:
  */
@@ -80,8 +80,7 @@ int chapid;
 
   if (!randinit) {
     randinit = 1;
-    if (srandomdev() < 0)
-      srandom((unsigned long)(time(NULL) ^ getpid()));
+    srandomdev();
   }
 
   cp = challenge_data;
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index 9d413a7..b13c110 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: command.c,v 1.55 1997/06/11 03:57:46 brian Exp $
+ * $Id: command.c,v 1.57 1997/06/13 03:59:34 brian Exp $
  *
  */
 #include <sys/types.h>
@@ -785,8 +785,7 @@ char **argv;
       VarRedialTimeout = -1;
       if (!randinit) {
 	randinit = 1;
-	if (srandomdev() < 0)
-	  srandom((unsigned long)(time(NULL) ^ getpid()));
+	srandomdev();
       }
     } else {
       timeout = atoi(argv[0]);
@@ -805,8 +804,7 @@ char **argv;
         VarRedialNextTimeout = -1;
         if (!randinit) {
           randinit = 1;
-          if (srandomdev() < 0)
-            srandom((unsigned long)(time(NULL) ^ getpid()));
+	  srandomdev();
         }
       }
       else {
diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c
index 522dbbee..8c99ab6 100644
--- a/usr.sbin/ppp/lcp.c
+++ b/usr.sbin/ppp/lcp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: lcp.c,v 1.22 1997/06/01 03:43:22 brian Exp $
+ * $Id: lcp.c,v 1.23 1997/06/09 03:27:24 brian Exp $
  *
  * TODO:
  *      o Validate magic number received from peer.
@@ -183,8 +183,7 @@ GenerateMagic()
 {
   if (!randinit) {
     randinit = 1;
-    if (srandomdev() < 0)
-      srandom((unsigned long)(time(NULL) ^ getpid()));
+    srandomdev();
   }
 
   return (random());
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
index b478c7b..b7f146d 100644
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pw_user.c,v 1.19 1997/03/24 15:09:41 ache Exp $
+ *	$Id: pw_user.c,v 1.20 1997/05/24 10:41:49 davidn Exp $
  */
 
 #include <unistd.h>
@@ -840,9 +840,10 @@ pw_pwcrypt(char *password)
 	if (!randinit) {
 		randinit = 1;
 #ifdef __FreeBSD__
-		if (srandomdev() < 0)
+		srandomdev();
+#else
+		srandom((unsigned long) (time(NULL) ^ getpid()));
 #endif
-			srandom((unsigned long) (time(NULL) ^ getpid()));
 	}
 	for (i = 0; i < 8; i++)
 		salt[i] = chars[random() % 63];
@@ -912,9 +913,10 @@ pw_password(struct userconf * cnf, struct cargs * args, char const * user)
 		if (!randinit) {
 			randinit = 1;
 #ifdef __FreeBSD__
-			if (srandomdev() < 0)
+			srandomdev();
+#else
+			srandom((unsigned long) (time(NULL) ^ getpid()));
 #endif
-				srandom((unsigned long) (time(NULL) ^ getpid()));
 		}
 		l = (random() % 8 + 8);	/* 8 - 16 chars */
 		pw_getrand(rndbuf, l);