summaryrefslogtreecommitdiffstats
path: root/source/n/vsftpd/vsftpd.conf.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/n/vsftpd/vsftpd.conf.diff')
-rw-r--r--source/n/vsftpd/vsftpd.conf.diff17
1 files changed, 7 insertions, 10 deletions
diff --git a/source/n/vsftpd/vsftpd.conf.diff b/source/n/vsftpd/vsftpd.conf.diff
index 230d858c8..1f410a7ac 100644
--- a/source/n/vsftpd/vsftpd.conf.diff
+++ b/source/n/vsftpd/vsftpd.conf.diff
@@ -1,5 +1,6 @@
---- ./vsftpd.conf.orig 2008-12-17 14:31:40.000000000 -0600
-+++ ./vsftpd.conf 2009-03-29 22:09:21.000000000 -0500
+diff -Nur vsftpd-2.2.1.orig/vsftpd.conf vsftpd-2.2.1/vsftpd.conf
+--- vsftpd-2.2.1.orig/vsftpd.conf 2009-10-18 21:04:23.000000000 -0500
++++ vsftpd-2.2.1/vsftpd.conf 2009-10-19 10:22:16.609407947 -0500
@@ -19,7 +19,7 @@
#
# Default umask for local users is 077. You may wish to change this to 022,
@@ -23,7 +24,7 @@
#
# You may change the default value for timing out an idle session.
#idle_session_timeout=600
-@@ -100,14 +100,17 @@
+@@ -101,12 +101,13 @@
# 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.
@@ -36,13 +37,9 @@
-listen=YES
+# When "listen" directive is enabled, vsftpd runs in standalone mode (rather
+# than from inetd) and listens on IPv4 sockets. To use vsftpd in standalone
-+# mode rather than with inetd, either change the line below to 'listen=YES'
-+# or comment it out. This directive cannot be used in conjunction with the
-+# listen_ipv6 directive.
++# mode rather than with inetd, change the line below to 'listen=YES'
++# This directive cannot be used in conjunction with the listen_ipv6 directive.
+listen=NO
#
# This directive enables listening on IPv6 sockets. To listen on IPv4 and IPv6
- # sockets, you must run two copies of vsftpd whith two configuration files.
- # Make sure, that one of the listen options is commented !!
- #listen_ipv6=YES
-+
+ # sockets, you must run two copies of vsftpd with two configuration files.