Large patch from Frank Cusack <fcusack@fcusack.com> to add proper

[ppp.git] / pppd / magic.c

diff --git a/pppd/magic.c b/pppd/magic.c
index 4797f0b19fd636f09c357b786b3378c002519ebd..3c70558359b7d0f532dce8b20cc63b8ecbb511e8 100644 (file)
--- a/pppd/magic.c
+++ b/pppd/magic.c
@@ -17,24 +17,21 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static char rcsid[] = "$Id: magic.c,v 1.5 1995/06/06 01:52:25 paulus Exp $";
-#endif
+#define RCSID  "$Id: magic.c,v 1.9 1999/08/13 06:46:15 paulus Exp $"
 
 #include <stdio.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/time.h>
 
 #include "pppd.h"
 #include "magic.h"
 
-static u_int32_t next;         /* Next value to return */
+static const char rcsid[] = RCSID;
 
-extern int gethostid __P((void));
 extern long mrand48 __P((void));
 extern void srand48 __P((long));
 
-
 /*
  * magic_init - Initialize the magic number generator.
  *
@@ -49,7 +46,7 @@ magic_init()
     struct timeval t;
 
     gettimeofday(&t, NULL);
-    seed = gethostid() ^ t.tv_sec ^ t.tv_usec ^ getpid();
+    seed = get_host_seed() ^ t.tv_sec ^ t.tv_usec ^ getpid();
     srand48(seed);
 }