Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a merge botch. pointed by Pavel Cahyna.

This commit is contained in:
yamt 2004-12-16 02:08:29 +00:00
parent d7dac6089c
commit db6316d151
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dist/pf/libexec/ftp-proxy/ftp-proxy.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: ftp-proxy.c,v 1.8 2004/11/19 20:52:10 wiz Exp $ */
/* $NetBSD: ftp-proxy.c,v 1.9 2004/12/16 02:08:29 yamt Exp $ */
/* $OpenBSD: ftp-proxy.c,v 1.37 2004/07/11 01:54:36 brad Exp $ */
/*
@ -1146,26 +1146,6 @@ main(int argc, char *argv[])
*/
drop_privs();
/*
* We check_host after get_proxy_env so that checks are done
* against the original destination endpoint, not the endpoint
* of our side of the rdr. This allows the use of tcpwrapper
* rules to restrict destinations as well as sources of connections
* for ftp.
*/
if (Use_Rdns)
flags = 0;
else
/*
* We may now drop root privs, as we have done our ioctl for
* pf. If we do drop root, we can't make backchannel connections
* for PORT and EPRT come from port 20, which is not strictly
* RFC compliant. This shouldn't cause problems for all but
* the stupidest ftp clients and the stupidest packet filters.
*/
drop_privs();
/*
* We check_host after get_proxy_env so that checks are done
* against the original destination endpoint, not the endpoint