diff options
| author | Andreas Klemm <andreas@FreeBSD.org> | 2000-05-24 14:11:19 +0000 |
|---|---|---|
| committer | Andreas Klemm <andreas@FreeBSD.org> | 2000-05-24 14:11:19 +0000 |
| commit | af0564d8098f5c0b1f1e45bc6fd9063da861aec2 (patch) | |
| tree | 60ad29b6f1add9f775962ce2f81b7d58b51fa4ce /databases/postgresql74-server/files/patch-aj | |
| parent | 62b01f4f9c617d95df99b4a773a4bc228f177e60 (diff) | |
upgrade postgresql to v 7.0 release
thanks for complete diffs ;-)
closed PR
PR: 18699
Obtained from: Palle Girgensohn <girgen@partitur.se>
Notes
Notes:
svn path=/head/; revision=28731
Diffstat (limited to 'databases/postgresql74-server/files/patch-aj')
| -rw-r--r-- | databases/postgresql74-server/files/patch-aj | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/databases/postgresql74-server/files/patch-aj b/databases/postgresql74-server/files/patch-aj index 480ecc4f5d64..4231fc94ede9 100644 --- a/databases/postgresql74-server/files/patch-aj +++ b/databases/postgresql74-server/files/patch-aj @@ -1,6 +1,6 @@ ---- bin/pg_passwd/pg_passwd.c.orig Thu May 27 09:00:40 1999 -+++ bin/pg_passwd/pg_passwd.c Mon Jun 21 16:34:27 1999 -@@ -26,11 +26,15 @@ +--- bin/pg_passwd/pg_passwd.c.orig Mon Apr 17 05:45:18 2000 ++++ bin/pg_passwd/pg_passwd.c Sat May 20 17:54:59 2000 +@@ -18,11 +18,15 @@ #endif @@ -9,15 +9,15 @@ +#endif + char *comname; - static void usage(FILE *stream); - static void read_pwd_file(char *filename); - static void write_pwd_file(char *filename, char *bkname); --static void encrypt_pwd(char key[9], char salt[3], char passwd[14]); -+static void encrypt_pwd(char key[9], char salt[3], char passwd[_PASSWORD_LEN+1]); - static void prompt_for_username(char *username); - static void prompt_for_password(char *prompt, char *password); + static void usage(FILE *stream); + static void read_pwd_file(char *filename); + static void write_pwd_file(char *filename, char *bkname); +-static void encrypt_pwd(char key[9], char salt[3], char passwd[14]); ++static void encrypt_pwd(char key[9], char salt[3], char passwd[_PASSWORD_LEN+1]); + static void prompt_for_username(char *username); + static void prompt_for_password(char *prompt, char *password); -@@ -158,7 +162,7 @@ +@@ -150,7 +154,7 @@ if (q != NULL) *(q++) = '\0'; @@ -26,7 +26,7 @@ { fprintf(stderr, "WARNING: %s: line %d: illegal password length.\n", filename, npwds + 1); -@@ -222,7 +226,7 @@ +@@ -214,7 +218,7 @@ } static void @@ -35,7 +35,7 @@ { int n; -@@ -254,9 +258,9 @@ +@@ -246,9 +250,9 @@ #ifdef NOT_USED static int @@ -47,16 +47,16 @@ char salt[3]; salt[0] = passwd[0]; -@@ -264,7 +268,7 @@ +@@ -256,7 +260,7 @@ salt[2] = '\0'; encrypt_pwd(key, salt, shouldbe); - return strncmp(shouldbe, passwd, 13) == 0 ? 1 : 0; + return strncmp(shouldbe, passwd, _PASSWORD_LEN) == 0 ? 1 : 0; } - #endif -@@ -339,7 +343,7 @@ + #endif +@@ -332,7 +336,7 @@ char salt[3]; char key[9], key2[9]; |