From 70e6ec79be8ae604cde1930760dc4bc6e1bdb896 Mon Sep 17 00:00:00 2001
From: Bill Marquette <billm@pfsense.org>
Date: Sat, 26 Feb 2005 05:37:28 +0000
Subject: sync passwd file with master.passwd make ftp-proxy work

---
 etc/inc/filter.inc |  3 +--
 etc/inetd.conf     |  2 +-
 etc/passwd         | 29 +++++++++++++++++++++--------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 3d0b0fe..7b1a133 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -973,8 +973,7 @@ anchor "carp"
 
 # enable ftp-proxy
 anchor "ftpproxy"
-pass in quick on $wanif inet proto tcp from port 20 to ($wanif) user proxy flags S/SA keep state
-pass in quick on $wanif inet proto tcp from any to $wanif port > 49000 user proxy keep state
+pass in quick on $wanif inet proto tcp from port 20 to ($wanif) port > 49000 user proxy flags S/SA keep state
 
 # allow access to DHCP server on LAN
 anchor "dhcpserverlan"
diff --git a/etc/inetd.conf b/etc/inetd.conf
index 87cf70f..42d8866 100644
--- a/etc/inetd.conf
+++ b/etc/inetd.conf
@@ -1 +1 @@
-ftp-proxy stream tcp nowait root /usr/lib/libexec/ftp-proxy ftp-proxy -n -D0 -m 55000 -M 57000 -t 180
\ No newline at end of file
+ftp-proxy stream tcp nowait root /usr/lib/libexec/ftp-proxy ftp-proxy -n -D0 -m 55000 -M 57000 -t 180 -u proxy
diff --git a/etc/passwd b/etc/passwd
index 86c9b58..227374e 100644
--- a/etc/passwd
+++ b/etc/passwd
@@ -1,10 +1,23 @@
 root:*:0:0:Charlie &:/root:/etc/rc.initial
 toor:*:0:0:Bourne-again Superuser:/root:
-daemon:*:1:1:Owner of many system processes:/root:/sbin/nologin
-operator:*:2:5:System &:/:/sbin/nologin
-bin:*:3:7:Binaries Commands and Source:/:/sbin/nologin
-tty:*:4:65533:Tty Sandbox:/:/sbin/nologin
-kmem:*:5:65533:KMem Sandbox:/:/sbin/nologin
-www:*:80:80:World Wide Web Owner:/nonexistent:/sbin/nologin
-nobody:*:65534:65534:Unprivileged user:/nonexistent:/sbin/nologin
-admin:*:101:101:Admin Account:/home/admin:/bin/sh
+daemon:*:1:1:Owner of many system processes:/root:/usr/sbin/nologin
+operator:*:2:5:System &:/:/usr/sbin/nologin
+bin:*:3:7:Binaries Commands and Source:/:/usr/sbin/nologin
+tty:*:4:65533:Tty Sandbox:/:/usr/sbin/nologin
+kmem:*:5:65533:KMem Sandbox:/:/usr/sbin/nologin
+games:*:7:13:Games pseudo-user:/usr/games:/usr/sbin/nologin
+news:*:8:8:News Subsystem:/:/usr/sbin/nologin
+man:*:9:9:Mister Man Pages:/usr/share/man:/usr/sbin/nologin
+sshd:*:22:22:Secure Shell Daemon:/var/empty:/usr/sbin/nologin
+smmsp:*:25:25:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin
+mailnull:*:26:26:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin
+bind:*:53:53:Bind Sandbox:/:/usr/sbin/nologin
+proxy:*:62:62:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin
+_pflogd:*:64:64:pflogd privsep user:/var/empty:/usr/sbin/nologin
+uucp:*:66:66:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico
+pop:*:68:6:Post Office Owner:/nonexistent:/usr/sbin/nologin
+www:*:80:80:World Wide Web Owner:/nonexistent:/usr/sbin/nologin
+nobody:*:65534:65534:Unprivileged user:/nonexistent:/usr/sbin/nologin
+distcc:*:1001:1001:Distcc:/home/distcc:/sbin/nologin
+dhcpd:*:1002:1002:DHCP Daemon:/nonexistent:/sbin/nologin
+admin:*:101:101:Admin User:/home/admin:/etc/rc.initial
-- 
cgit v1.1