38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
--- vsftpd-2.3.4/vsftpd.conf~ 2011-11-21 13:15:03.888357116 +0000
|
|
+++ vsftpd-2.3.4/vsftpd.conf 2011-11-21 13:17:43.676136602 +0000
|
|
@@ -108,12 +108,16 @@ xferlog_std_format=YES
|
|
# When "listen" directive is enabled, vsftpd runs in standalone mode and
|
|
# listens on IPv4 sockets. This directive cannot be used in conjunction
|
|
# with the listen_ipv6 directive.
|
|
-listen=YES
|
|
+listen=NO
|
|
#
|
|
-# This directive enables listening on IPv6 sockets. To listen on IPv4 and IPv6
|
|
-# sockets, you must run two copies of vsftpd with two configuration files.
|
|
+# This directive enables listening on IPv6 sockets. By default, listening
|
|
+# on the IPv6 "any" address (::) will accept connections from both IPv6
|
|
+# and IPv4 clients. It is not necessary to listen on *both* IPv4 and IPv6
|
|
+# sockets. If you want that (perhaps because you want to listen on specific
|
|
+# addresses) then you must run two copies of vsftpd with two configuration
|
|
+# files.
|
|
# Make sure, that one of the listen options is commented !!
|
|
-#listen_ipv6=YES
|
|
+listen_ipv6=YES
|
|
|
|
pam_service_name=vsftpd
|
|
userlist_enable=YES
|
|
--- vsftpd-2.3.4/vsftpd.conf.5~ 2011-11-21 13:15:03.905357305 +0000
|
|
+++ vsftpd-2.3.4/vsftpd.conf.5 2011-11-21 13:18:31.771672385 +0000
|
|
@@ -281,8 +281,9 @@ Default: NO
|
|
.TP
|
|
.B listen_ipv6
|
|
Like the listen parameter, except vsftpd will listen on an IPv6 socket instead
|
|
-of an IPv4 one. This parameter and the listen parameter are mutually
|
|
-exclusive.
|
|
+of an IPv4 one. Note that a socket listening on the IPv6 "any" address (::)
|
|
+will accept both IPv6 and IPv4 connections by default. This parameter and the
|
|
+listen parameter are mutually exclusive.
|
|
|
|
Default: NO
|
|
.TP
|