diff options
author | gpalmer <gpalmer@FreeBSD.org> | 1995-01-13 01:24:37 +0000 |
---|---|---|
committer | gpalmer <gpalmer@FreeBSD.org> | 1995-01-13 01:24:37 +0000 |
commit | 5c3fa9f6cae19dc4f43ba2d8d21a41c603ce5448 (patch) | |
tree | f24dca47a4a59f037bde51e817c840e64b06c1c6 /ftp | |
parent | 4f447a90f0adf1eb03a33c9bcfcd4d1277fa4d06 (diff) | |
download | FreeBSD-ports-5c3fa9f6cae19dc4f43ba2d8d21a41c603ce5448.zip FreeBSD-ports-5c3fa9f6cae19dc4f43ba2d8d21a41c603ce5448.tar.gz |
Fix for the wu-ftpd coring problem.
Submitted by: Ollivier Robert <roberto@blaise.ibp.fr>
Diffstat (limited to 'ftp')
-rw-r--r-- | ftp/wu-ftpd+ipv6/files/patch-aa | 24 | ||||
-rw-r--r-- | ftp/wu-ftpd/files/patch-aa | 24 |
2 files changed, 40 insertions, 8 deletions
diff --git a/ftp/wu-ftpd+ipv6/files/patch-aa b/ftp/wu-ftpd+ipv6/files/patch-aa index 24b57b2..02cbc4b 100644 --- a/ftp/wu-ftpd+ipv6/files/patch-aa +++ b/ftp/wu-ftpd+ipv6/files/patch-aa @@ -1,5 +1,6 @@ +---------------------------------------------------------- *** src/ftpd.c.orig Wed Apr 13 23:17:18 1994 ---- src/ftpd.c Sat Dec 17 23:48:25 1994 +--- src/ftpd.c Fri Jan 13 01:26:40 1995 *************** *** 139,146 **** *freopen(const char *, const char *, FILE *); @@ -68,8 +69,8 @@ /* Delay before reading passwd after first failed attempt to slow down * passwd-guessing programs. */ *************** -*** 1007,1013 **** ---- 1027,1038 ---- +*** 1007,1014 **** +--- 1027,1039 ---- #ifdef KERBEROS xpasswd = crypt16(passwd, salt); #else @@ -78,10 +79,25 @@ + pwok = 0; + #else xpasswd = crypt(passwd, salt); -+ #endif #endif ++ #endif #ifdef ULTRIX_AUTH + if ((numfails = ultrix_check_pass(passwd, xpasswd)) < 0) { +*************** +*** 1422,1428 **** +--- 1447,1457 ---- + for (loop = 0; namebuf[loop]; loop++) + if (isspace(namebuf[loop]) || iscntrl(namebuf[loop])) + namebuf[loop] = '_'; ++ #if (defined(BSD) && (BSD >= 199306)) ++ sprintf(msg, "%.24s %d %s %qd %s %c %s %c %c %s ftp %d %s\n", ++ #else + sprintf(msg, "%.24s %d %s %d %s %c %s %c %c %s ftp %d %s\n", ++ #endif + ctime(&curtime), + xfertime, + remotehost, diff -c -r src/realpath.c.orig src/realpath.c *** src/realpath.c.orig Fri Apr 1 21:03:45 1994 --- src/realpath.c Tue Oct 18 17:48:34 1994 diff --git a/ftp/wu-ftpd/files/patch-aa b/ftp/wu-ftpd/files/patch-aa index 24b57b2..02cbc4b 100644 --- a/ftp/wu-ftpd/files/patch-aa +++ b/ftp/wu-ftpd/files/patch-aa @@ -1,5 +1,6 @@ +---------------------------------------------------------- *** src/ftpd.c.orig Wed Apr 13 23:17:18 1994 ---- src/ftpd.c Sat Dec 17 23:48:25 1994 +--- src/ftpd.c Fri Jan 13 01:26:40 1995 *************** *** 139,146 **** *freopen(const char *, const char *, FILE *); @@ -68,8 +69,8 @@ /* Delay before reading passwd after first failed attempt to slow down * passwd-guessing programs. */ *************** -*** 1007,1013 **** ---- 1027,1038 ---- +*** 1007,1014 **** +--- 1027,1039 ---- #ifdef KERBEROS xpasswd = crypt16(passwd, salt); #else @@ -78,10 +79,25 @@ + pwok = 0; + #else xpasswd = crypt(passwd, salt); -+ #endif #endif ++ #endif #ifdef ULTRIX_AUTH + if ((numfails = ultrix_check_pass(passwd, xpasswd)) < 0) { +*************** +*** 1422,1428 **** +--- 1447,1457 ---- + for (loop = 0; namebuf[loop]; loop++) + if (isspace(namebuf[loop]) || iscntrl(namebuf[loop])) + namebuf[loop] = '_'; ++ #if (defined(BSD) && (BSD >= 199306)) ++ sprintf(msg, "%.24s %d %s %qd %s %c %s %c %c %s ftp %d %s\n", ++ #else + sprintf(msg, "%.24s %d %s %d %s %c %s %c %c %s ftp %d %s\n", ++ #endif + ctime(&curtime), + xfertime, + remotehost, diff -c -r src/realpath.c.orig src/realpath.c *** src/realpath.c.orig Fri Apr 1 21:03:45 1994 --- src/realpath.c Tue Oct 18 17:48:34 1994 |