Remove those patches.

This commit is contained in:
kevlo 1999-11-11 02:02:18 +00:00
parent f8a1a282fe
commit 8eab8ebd22
3 changed files with 21 additions and 57 deletions

View File

@ -1,17 +0,0 @@
*** template/openbsd.orig Mon May 18 12:39:02 1998
--- template/openbsd Mon May 18 12:39:17 1998
***************
*** 1,6 ****
AROPT:cq
SHARED_LIB:-fpic -DPIC
! CFLAGS:-O2 -m486 -pipe
SRCH_INC:/usr/local/include
SRCH_LIB:/usr/local/lib
USE_LOCALE:no
--- 1,6 ----
AROPT:cq
SHARED_LIB:-fpic -DPIC
! CFLAGS:-O2 -pipe
SRCH_INC:/usr/local/include
SRCH_LIB:/usr/local/lib
USE_LOCALE:no

View File

@ -1,6 +1,8 @@
--- bin/pg_passwd/pg_passwd.c.orig Sat Jan 31 19:09:26 1998
+++ bin/pg_passwd/pg_passwd.c Sat Jan 31 19:15:43 1998
@@ -23,12 +23,16 @@
# $OpsnBSD: $
--- 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 @@
#endif
@ -9,17 +11,15 @@
+#endif
+
char *comname;
void usage(FILE *stream);
void read_pwd_file(char *filename);
void write_pwd_file(char *filename, char *bkname);
-void encrypt_pwd(char key[9], char salt[3], char passwd[14]);
-int check_pwd(char key[9], char passwd[14]);
+void encrypt_pwd(char key[9], char salt[3], char passwd[_PASSWORD_LEN+1]);
+int check_pwd(char key[9], char passwd[_PASSWORD_LEN+1]);
void prompt_for_username(char *username);
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);
@@ -148,7 +152,7 @@
@@ -158,7 +162,7 @@
if (q != NULL)
*(q++) = '\0';
@ -28,19 +28,19 @@
{
fprintf(stderr, "WARNING: %s: line %d: illegal password length.\n",
filename, npwds + 1);
@@ -208,7 +212,7 @@
@@ -222,7 +226,7 @@
}
void
static void
-encrypt_pwd(char key[9], char salt[3], char passwd[14])
+encrypt_pwd(char key[9], char salt[3], char passwd[_PASSWORD_LEN+1])
{
int n;
@@ -242,9 +246,9 @@
}
@@ -254,9 +258,9 @@
int
#ifdef NOT_USED
static int
-check_pwd(char key[9], char passwd[14])
+check_pwd(char key[9], char passwd[_PASSWORD_LEN+1])
{
@ -49,16 +49,16 @@
char salt[3];
salt[0] = passwd[0];
@@ -252,7 +256,7 @@
@@ -264,7 +268,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
void
@@ -326,7 +330,7 @@
@@ -339,7 +343,7 @@
char salt[3];
char key[9],
key2[9];

View File

@ -1,19 +0,0 @@
*** configure.orig Wed Jun 17 10:56:00 1998
--- configure Wed Jun 17 11:08:22 1998
***************
*** 1135,1141 ****
HAVECXX='HAVE_Cplusplus=false'
!
INSTALLPATH="/usr/ucb:$PATH"
for ac_prog in ginstall installbsd bsdinst scoinst install
do
--- 1135,1141 ----
HAVECXX='HAVE_Cplusplus=false'
! test "$INSTALL" && INSTALL=`echo $INSTALL |cut -f1 -d' '`
INSTALLPATH="/usr/ucb:$PATH"
for ac_prog in ginstall installbsd bsdinst scoinst install
do