diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2010-06-29 12:20:30 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2010-06-29 12:20:30 +0000 |
| commit | e845e0092547298f38f0b9e35469bdc95ecffcee (patch) | |
| tree | ce3a67e2bf9e8864a5b0db4a418f9354f9b7bf3e /ftp | |
| parent | - Update to 1.62 (diff) | |
Uncomment dologout(-1) on SIGHUP and the like signals, stale wtmp entries
appears otherwise.
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=257157
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/wu-ftpd/Makefile | 2 | ||||
| -rw-r--r-- | ftp/wu-ftpd/files/patch-aa | 30 |
2 files changed, 21 insertions, 11 deletions
diff --git a/ftp/wu-ftpd/Makefile b/ftp/wu-ftpd/Makefile index 8f247406d5bd..1b2daedd6f97 100644 --- a/ftp/wu-ftpd/Makefile +++ b/ftp/wu-ftpd/Makefile @@ -9,7 +9,7 @@ PORTNAME= wu-ftpd PORTVERSION= 2.6.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= ftp MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/ PATCH_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/patches/apply_to_2.6.2/ diff --git a/ftp/wu-ftpd/files/patch-aa b/ftp/wu-ftpd/files/patch-aa index e30bca38ba16..523ec5127f8c 100644 --- a/ftp/wu-ftpd/files/patch-aa +++ b/ftp/wu-ftpd/files/patch-aa @@ -1,5 +1,5 @@ ---- src/ftpd.c.orig 2010-05-27 01:19:29.000000000 +0400 -+++ src/ftpd.c 2010-05-27 01:19:56.000000000 +0400 +--- ftpd.c.orig 2010-06-29 15:52:01.000000000 +0400 ++++ ftpd.c 2010-06-29 16:11:19.000000000 +0400 @@ -447,7 +447,6 @@ #ifdef OPIE #include <opie.h> @@ -19,7 +19,17 @@ #ifdef HAVE_LIBRESOLV /* check permitted access based on remote host DNS information */ if (!check_reverse_dns()) { -@@ -1662,9 +1657,9 @@ +@@ -1387,8 +1382,7 @@ + chdir("/"); + signal(SIGIOT, SIG_DFL); + signal(SIGILL, SIG_DFL); +- exit(1); +- /* dologout(-1); *//* NOTREACHED */ ++ dologout(-1); /* NOTREACHED */ + } + + SIGNAL_TYPE lostconn(int sig) +@@ -1662,9 +1656,9 @@ /* Display s/key challenge where appropriate. */ if (pwd == NULL || skeychallenge(&skey, pwd->pw_name, sbuf)) @@ -31,7 +41,7 @@ pwok ? "allowed" : "required", name); return (buf); } -@@ -2105,16 +2100,17 @@ +@@ -2105,16 +2099,17 @@ #ifdef OPIE { char prompt[OPIE_CHALLENGE_MAX + 1]; @@ -57,7 +67,7 @@ } #else reply(331, "Password required for %s.", name); -@@ -2593,8 +2589,8 @@ +@@ -2593,8 +2588,8 @@ if (pw == NULL) salt = "xx"; else @@ -67,7 +77,7 @@ #ifdef SECUREOSF if ((pr = getprpwnam(pw->pw_name)) != NULL) { if (pr->uflg.fg_newcrypt) -@@ -2627,9 +2623,15 @@ +@@ -2627,9 +2622,15 @@ xpasswd = crypt(passwd, salt); #endif /* SKEY */ #else /* OPIE */ @@ -86,7 +96,7 @@ #endif /* OPIE */ #ifdef ULTRIX_AUTH if ((numfails = ultrix_check_pass(passwd, xpasswd)) >= 0) { -@@ -3189,7 +3191,7 @@ +@@ -3189,7 +3190,7 @@ pw->pw_name, pw->pw_dir); goto bad; #else @@ -95,7 +105,7 @@ #ifdef VERBOSE_ERROR_LOGING syslog(LOG_NOTICE, "FTP LOGIN FAILED (cannot chdir) for %s, %s", remoteident, pw->pw_name); -@@ -3508,7 +3510,7 @@ +@@ -3508,7 +3509,7 @@ { char *a; a = (char *) malloc(len + 1); @@ -104,7 +114,7 @@ a[len] = 0; if (strlen(s) <= len) memcpy(a, s, strlen(s)); -@@ -7469,6 +7471,8 @@ +@@ -7469,6 +7470,8 @@ in++; if (*in == '/') in++; @@ -113,7 +123,7 @@ } else if ((in[0] == '.') && (in[1] == '.') && ((in[2] == '/') || (in[2] == '\0'))) { if (out == path) { -@@ -7497,6 +7501,9 @@ +@@ -7497,6 +7500,9 @@ } else { do |