diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-12-01 07:32:38 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-12-01 07:32:38 +0000 |
| commit | a695cdf4a00af9f10cbbe0e8a1340b8fc7fe238a (patch) | |
| tree | 9eab08d0a71d2e91360ddb3c14e3b7e823ac104f | |
| parent | a8d27a2dea3c79d721f8e721aee2f66e68d29559 (diff) | |
switch to new _ftp_proxy user; ok dlg
| -rw-r--r-- | usr.sbin/ftp-proxy/ftp-proxy.8 | 6 | ||||
| -rw-r--r-- | usr.sbin/ftp-proxy/ftp-proxy.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/ftp-proxy/ftp-proxy.8 b/usr.sbin/ftp-proxy/ftp-proxy.8 index 396d3bf2b3e..7c5ae916d2d 100644 --- a/usr.sbin/ftp-proxy/ftp-proxy.8 +++ b/usr.sbin/ftp-proxy/ftp-proxy.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ftp-proxy.8,v 1.20 2015/01/09 11:19:12 stsp Exp $ +.\" $OpenBSD: ftp-proxy.8,v 1.21 2015/12/01 07:32:37 deraadt Exp $ .\" .\" Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: January 9 2015 $ +.Dd $Mdocdate: December 1 2015 $ .Dt FTP-PROXY 8 .Os .Sh NAME @@ -82,7 +82,7 @@ pass out from $client to $server port $port nat-to $proxy .Ed .Pp .Nm -chroots to "/var/empty" and changes to user "proxy" to drop privileges. +chroots to "/var/empty" and changes to user "_ftp-proxy" to drop privileges. .Pp The options are as follows: .Bl -tag -width Ds diff --git a/usr.sbin/ftp-proxy/ftp-proxy.c b/usr.sbin/ftp-proxy/ftp-proxy.c index 57d58fa97ff..5706d85fbac 100644 --- a/usr.sbin/ftp-proxy/ftp-proxy.c +++ b/usr.sbin/ftp-proxy/ftp-proxy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftp-proxy.c,v 1.30 2015/01/21 21:50:33 deraadt Exp $ */ +/* $OpenBSD: ftp-proxy.c,v 1.31 2015/12/01 07:32:37 deraadt Exp $ */ /* * Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl> @@ -52,7 +52,7 @@ #define TCP_BACKLOG 10 #define CHROOT_DIR "/var/empty" -#define NOPRIV_USER "proxy" +#define NOPRIV_USER "ftp-proxy" /* pfctl standard NAT range. */ #define PF_NAT_PROXY_PORT_LOW 50001 |