diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1997-06-14 00:27:03 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1997-06-14 00:27:03 +0000 |
| commit | 687ee69a2abe1b2c2c56c935dda90df37c17ed04 (patch) | |
| tree | 4add7f59d98f22f308bf7716d44bcb50cb647b49 /usr.sbin/pw/pw_user.c | |
| parent | 545cda7db5ae1957628bc73b02aaf805a35474de (diff) | |
| download | src-687ee69a2abe1b2c2c56c935dda90df37c17ed04.tar.gz src-687ee69a2abe1b2c2c56c935dda90df37c17ed04.zip | |
Remove srandomdev fallback code
Notes
Notes:
svn path=/head/; revision=26626
Diffstat (limited to 'usr.sbin/pw/pw_user.c')
| -rw-r--r-- | usr.sbin/pw/pw_user.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c index b478c7b95a41..b7f146dd338c 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); |