Merge remote-tracking branch 'origin/next'

[ipfire-2.x.git] / config / etc / passwd

diff --git a/config/etc/passwd b/config/etc/passwd
index 542e3bf94ed5d15f928d8beb6f9ee24f074ccbb3..247faa2a172c4ba103f80de6c6414430c4a320e4 100644 (file)
--- a/config/etc/passwd
+++ b/config/etc/passwd
@@ -6,7 +6,6 @@ squid:x:23:23:ftp:/var/spool/squid:/bin/false
 ntp:x:38:38::/etc/ntp:/bin/false
 mysql:x:41:41:MySQL Server:/dev/null:/bin/false
 ftp:x:45:45:anonymous_user:/home/ftp:/bin/false
-vsftpd:x:47:47:vsftpd User:/home/ftp:/bin/false
 rsyncd:x:48:48:rsyncd Daemon:/home/rsync:/bin/false
 stunnel:x:51:51:stunnel Daemon:/var/lib/stunnel:/bin/false
 sshd:x:74:74:sshd:/var/empty:/bin/false
@@ -21,6 +20,5 @@ clamav:x:109:109:Clam AntiVirus:/home/clamav:/bin/false
 amavis:x:110:110:Amavisd-new user:/var/amavis:
 cyrus:x:111:12:Cyrus user:/usr/cyrus:
 filter:x:112:12:Spam user:/home/filter:/bin/false
-mldonkey:x:113:111:Mldonkey user:/opt/mldonkey:/bin/false
 asterisk:x:114:114:Asterisk user:/var/empty:/bin/false
 samba:x:1000:1000:Samba User:/var/empty:/bin/false