diff options
author | ache <ache@FreeBSD.org> | 2004-03-08 21:39:20 +0800 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 2004-03-08 21:39:20 +0800 |
commit | ea5c0d3a782962dd5217f459468acdefdc8f0dae (patch) | |
tree | 00690053c45fa5f93c254aa687749efccb369728 /ftp | |
parent | 46ad3bb108785a5dc370a2cb81e8c66efd647833 (diff) | |
download | freebsd-ports-gnome-ea5c0d3a782962dd5217f459468acdefdc8f0dae.tar.gz freebsd-ports-gnome-ea5c0d3a782962dd5217f459468acdefdc8f0dae.tar.zst freebsd-ports-gnome-ea5c0d3a782962dd5217f459468acdefdc8f0dae.zip |
fix for `restricted-uid'/`restricted-gid' directive may be bypassed
Submitted by: Matt Zimmerman <mdz@debian.org>
Diffstat (limited to 'ftp')
-rw-r--r-- | ftp/wu-ftpd/Makefile | 2 | ||||
-rw-r--r-- | ftp/wu-ftpd/files/patch-aa | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/ftp/wu-ftpd/Makefile b/ftp/wu-ftpd/Makefile index ab085a896174..b690332863eb 100644 --- a/ftp/wu-ftpd/Makefile +++ b/ftp/wu-ftpd/Makefile @@ -9,7 +9,7 @@ PORTNAME= wu-ftpd PORTVERSION= 2.6.2 -PORTREVISION= 3 +PORTREVISION= 4 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 8ce2f17afbf2..fb9496f1c4fe 100644 --- a/ftp/wu-ftpd/files/patch-aa +++ b/ftp/wu-ftpd/files/patch-aa @@ -1,5 +1,5 @@ ---- src/ftpd.c.orig Tue Oct 2 22:21:17 2001 -+++ src/ftpd.c Tue Oct 2 22:21:17 2001 +--- src/ftpd.c.orig Mon Mar 8 07:24:50 2004 ++++ src/ftpd.c Mon Mar 8 07:24:50 2004 @@ -447,7 +447,6 @@ #ifdef OPIE #include <opie.h> @@ -86,3 +86,12 @@ #endif /* OPIE */ #ifdef ULTRIX_AUTH if ((numfails = ultrix_check_pass(passwd, xpasswd)) >= 0) { +@@ -3189,7 +3191,7 @@ + pw->pw_name, pw->pw_dir); + goto bad; + #else +- if (chdir("/") < 0) { ++ if (restricted_user || chdir("/") < 0) { + #ifdef VERBOSE_ERROR_LOGING + syslog(LOG_NOTICE, "FTP LOGIN FAILED (cannot chdir) for %s, %s", + remoteident, pw->pw_name); |