diff -ruN vsftpd-1.2.0.orig/vsftpd.conf vsftpd-1.2.0/vsftpd.conf
--- vsftpd-1.2.0.orig/vsftpd.conf	2003-01-21 02:15:34.000000000 +0100
+++ vsftpd-1.2.0/vsftpd.conf	2003-06-15 17:19:02.000000000 +0200
@@ -1,15 +1,26 @@
-# Example config file /etc/vsftpd.conf
-#
-# The default compiled in settings are fairly paranoid. This sample file
-# loosens things up a bit, to make the ftp daemon more usable.
-# Please see vsftpd.conf.5 for all compiled in defaults.
+# /etc/vsftpd/vsftpd.conf - vsftpd configuration file
 #
 # READ THIS: This example file is NOT an exhaustive list of vsftpd options.
 # Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's
 # capabilities.
 #
-# Allow anonymous FTP? (Beware - allowed by default if you comment this out).
-anonymous_enable=YES
+# Uncomment the below to make vsftpd run in standalone mode. This mean that
+# vsftp must not be run from an inetd of some kind. Instead, the vsftpd
+# executable is run once directly. vsftpd itself will then take care of
+# listening for and handling incoming connections.
+#listen=YES
+#
+# The same as the previous but listen on an IPv6 socket instead of an IPv4
+# one. This parameter and the listen parameter are mutually exclusive.
+#listen_ipv6=YES
+#
+# When uncommented, and listen (or listen_ipv6) is YES, vsftpd will
+# background the listener process (i.e. control will immediately be
+# returned to the shell which launched vsftpd.
+#background=YES
+#
+# Comment this out if you want to disable anonymous FTP.
+#anonymous_enable=NO
 #
 # Uncomment this to allow local users to log in.
 #local_enable=YES
@@ -17,9 +28,13 @@
 # Uncomment this to enable any form of FTP write command.
 #write_enable=YES
 #
-# Default umask for local users is 077. You may wish to change this to 022,
-# if your users expect that (022 is used by most other ftpd's)
-#local_umask=022
+# Default umask for local users is 077. The below changes this to 022 (022
+# is used by most other ftpd's).
+local_umask=022
+#
+# Uncomment this and vsftpd will not check /etc/shells for a valid user
+# shell for local logins.
+#check_shell=NO
 #
 # Uncomment this to allow the anonymous FTP user to upload files. This only
 # has an effect if the above global write enable is activated. Also, you will
@@ -30,6 +45,10 @@
 # new directories.
 #anon_mkdir_write_enable=YES
 #
+# Uncomment this and vsftpd will not ask anonymous users for password - the
+# anonymous users will log straight in.
+#no_anon_password=YES
+#
 # Activate directory messages - messages given to remote users when they
 # go into a certain directory.
 dirmessage_enable=YES
@@ -48,7 +67,7 @@
 #
 # You may override where the log file goes if you like. The default is shown
 # below.
-#xferlog_file=/var/log/vsftpd.log
+#xferlog_file=/var/log/vsftpd
 #
 # If you want, you can have your log file in standard ftpd xferlog format
 #xferlog_std_format=YES
@@ -61,7 +80,7 @@
 #
 # It is recommended that you define on your system a unique user which the
 # ftp server can use as a totally isolated and unprivileged user.
-#nopriv_user=ftpsecure
+#nopriv_user=vsftpd
 #
 # Enable this and the server will recognise asynchronous ABOR requests. Not
 # recommended for security (the code is non-trivial). Not enabling it,
@@ -85,21 +104,52 @@
 #ftpd_banner=Welcome to blah FTP service.
 #
 # You may specify a file of disallowed anonymous e-mail addresses. Apparently
-# useful for combatting certain DoS attacks.
-#deny_email_enable=YES
-# (default follows)
-#banned_email_file=/etc/vsftpd.banned_emails
-#
-# You may specify an explicit list of local users to chroot() to their home
-# directory. If chroot_local_user is YES, then this list becomes a list of
-# users to NOT chroot().
-#chroot_list_enable=YES
-# (default follows)
-#chroot_list_file=/etc/vsftpd.chroot_list
+# useful for combatting certain DoS attacks. Comment this out to disable this
+# feature.
+deny_email_enable=YES
+#
+# This is the default file where banned emails are stored.
+#banned_email_file=/etc/vsftpd/banned_emails
+#
+# This makes local users to chroot() to their home directories. If you don't
+# want them to chroot(), comment this out.
+chroot_local_user=YES
+#
+# You may specify an explicit list of local users NOT to chroot() to their
+# home directories. If chroot_local_user is NO (or is commented out), then
+# this list becomes a list of users TO chroot(). Comment this out to disable
+# this feature at all.
+chroot_list_enable=YES
+#
+# This is the default file where the list is stored.
+#chroot_list_file=/etc/vsftpd/chroot_list
+#
+# Enable list (/etc/vsftpd/user_list by default) of users who won't be able
+# to log in.
+userlist_enable=YES
+#
+# You can change location of file used by userlist_enable option.
+#userlist_file=/etc/vsftpd/user_list
+#
+# Uncomment this option to change behavior of userlist_enable so users listed
+# in userlist_file will be able to log in and all other will be denied.
+#userlist_deny=NO
 #
 # You may activate the "-R" option to the builtin ls. This is disabled by
 # default to avoid remote users being able to cause excessive I/O on large
 # sites. However, some broken FTP clients such as "ncftp" and "mirror" assume
 # the presence of the "-R" option, so there is a strong case for enabling it.
 #ls_recurse_enable=YES
-
+#
+# This powerful option allows the override of any config option specified in
+# the manual page, on a per-user basis.
+user_config_dir=/etc/vsftpd/user_conf
+#
+# If enabled, all user and group information in directory listings will be
+# displayed as "ftp".
+#hide_ids=YES
+#
+# If enabled, vsftpd will display directory listings with the time in your
+# local time zone. The default is to display GMT. The times returned by the
+# MDTM FTP command are also affected by this option.
+#use_localtime=YES