From 89ad3270993087b162031af34d67a29686a9bf01 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sun, 2 Nov 1997 18:15:20 +0000 Subject: [PATCH] Portability fix for pg_passwd. --- src/bin/pg_passwd/pg_passwd.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/bin/pg_passwd/pg_passwd.c b/src/bin/pg_passwd/pg_passwd.c index a4fd49782d9..682e07eb338 100644 --- a/src/bin/pg_passwd/pg_passwd.c +++ b/src/bin/pg_passwd/pg_passwd.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #define issaltchar(c) (isalnum(c) || (c) == '.' || (c) == '/') @@ -111,7 +111,7 @@ try_again: /* get user name */ p = line; - if ((q = index(p, ':')) == NULL) + if ((q = strchr(p, ':')) == NULL) { fprintf(stderr, "%s: line %d: illegal format.\n", filename, npwds + 1); @@ -138,10 +138,10 @@ try_again: /* get password field */ p = q; - q = index(p, ':'); + q = strchr(p, ':'); /* - * --- don't care ----- if ((q = index(p, ':')) == NULL) { + * --- don't care ----- if ((q = strchr(p, ':')) == NULL) { * fprintf(stderr, "%s: line %d: illegal format.\n", filename, * npwds + 1); exit(1); } */ @@ -215,10 +215,7 @@ encrypt_pwd(char key[9], char salt[3], char passwd[14]) /* get encrypted password */ if (salt[0] == '\0') { - struct timeval tm; - - gettimeofday(&tm, NULL); - srand(tm.tv_sec ? tm.tv_sec : 1); + srand(time(NULL)); do { n = rand() % 256; -- 2.39.5