fix for restricted-uid'/restricted-gid' directive may be bypassed

Submitted by:	Matt Zimmerman <mdz@debian.org>
This commit is contained in:
Munechika SUMIKAWA 2004-03-08 13:58:54 +00:00
parent 992adfd381
commit 3122ba2d12
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=103316
2 changed files with 12 additions and 3 deletions

View File

@ -9,7 +9,7 @@
PORTNAME= wu-ftpd+ipv6
PORTVERSION= 2.6.2
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= ftp ipv6
MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
DISTNAME= wu-ftpd-${PORTVERSION}

View File

@ -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);