summaryrefslogtreecommitdiff
path: root/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf
diff options
context:
space:
mode:
authorBeech Rintoul <beech@FreeBSD.org>2007-07-06 05:45:08 +0000
committerBeech Rintoul <beech@FreeBSD.org>2007-07-06 05:45:08 +0000
commit1022729c90c0dda658b0662db3b86caee8013161 (patch)
tree09c0b307bb4effd9034281a6231402e7afbf1f66 /ftp/proftpd-devel/files/patch-sample-configurations_basic.conf
parent- Update to 1.5.6 (diff)
- Update to 1.3.1r3
- Remove patches integrated upstream - Makefile cleanup - Bugfixes: Fixed segfault which can occur if NLST is used twice, the first time on a path which does not exist. Fixed reporting of addresses via EPSV for IPv6 addresses. Fixes occurrences of "ai_family not supported" for inetd-run proftpd daemons. DisplayLogin, DisplayQuit, and DisplayTransferFiles files now work regardless of whether the session process is chrooted. Approved by: sat (mentor)
Notes
Notes: svn path=/head/; revision=195049
Diffstat (limited to 'ftp/proftpd-devel/files/patch-sample-configurations_basic.conf')
-rw-r--r--ftp/proftpd-devel/files/patch-sample-configurations_basic.conf16
1 files changed, 9 insertions, 7 deletions
diff --git a/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf b/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf
index d6312df3da95..90ccbf9aff48 100644
--- a/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf
+++ b/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf
@@ -1,8 +1,8 @@
---- sample-configurations/basic.conf.orig Thu Apr 15 19:46:38 2004
-+++ sample-configurations/basic.conf Wed Nov 15 19:14:36 2006
+--- sample-configurations/basic.conf.orig 2007-03-09 10:01:30.000000000 -0900
++++ sample-configurations/basic.conf 2007-07-05 09:29:42.000000000 -0800
@@ -1,3 +1,7 @@
+#
-+# To have more informations about Proftpd configuration
++# For more informations about Proftpd configuration
+# look at : http://www.proftpd.org/
+#
# This is a basic ProFTPD configuration file (rename it to
@@ -12,7 +12,7 @@
ServerName "ProFTPD Default Installation"
ServerType standalone
DefaultServer on
-+ScoreboardFile /var/run/proftpd.scoreboard
++ScoreboardFile /var/run/proftpd.scoreboard
# Port 21 is the standard FTP port.
Port 21
@@ -20,12 +20,12 @@
# (such as xinetd).
MaxInstances 30
-+CommandBufferSize 512
++CommandBufferSize 512
+
# Set the user and group under which the server will run.
User nobody
Group nogroup
-@@ -40,23 +47,29 @@
+@@ -40,23 +47,31 @@
# A basic anonymous configuration, no upload directories. If you do not
# want anonymous users, simply delete this entire <Anonymous> section.
@@ -42,13 +42,14 @@
- # We want 'welcome.msg' displayed at login, and '.message' displayed
- # in each newly chdired directory.
- DisplayLogin welcome.msg
-- DisplayFirstChdir .message
+- DisplayChdir .message
-
- # Limit WRITE everywhere in the anonymous chroot
- <Limit WRITE>
- DenyAll
- </Limit>
-</Anonymous>
++
+#########################################################################
+# #
+# Uncomment lines with only one # to allow basic anonymous access #
@@ -75,3 +76,4 @@
+ # DenyAll
+ # </Limit>
+#</Anonymous>
++