# HG changeset patch
# User Milan Jurik <Milan.Jurik@oracle.com>
# Date 1311856935 25200
# Node ID 1b84695d4fb48957d6050c4e390a926a4f4a4db3
# Parent  399743e600462656d595efec7fc4926df5b360d0
7070515 proftpd should have bigger buffer than 1kB
7069674 /etc/proftpd.conf file should have "RootLogin" keyword with "off" state by default.

diff -r 399743e60046 -r 1b84695d4fb4 components/proftpd/Makefile
--- a/components/proftpd/Makefile	Thu Jul 28 04:21:23 2011 -0700
+++ b/components/proftpd/Makefile	Thu Jul 28 05:42:15 2011 -0700
@@ -67,6 +67,7 @@
 CONFIGURE_OPTIONS +=	--disable-static
 CONFIGURE_OPTIONS +=	--with-modules=mod_solaris_audit:mod_solaris_priv
 CONFIGURE_OPTIONS +=	--with-shared=mod_facl:mod_wrap:mod_tls:mod_auth_gss:mod_gss
+CONFIGURE_OPTIONS +=	--enable-buffer-size=16384
 
 # Copy Solaris modules and GSSAPI modules to proftpd source tree
 COMPONENT_PRE_CONFIGURE_ACTION = \
diff -r 399743e60046 -r 1b84695d4fb4 components/proftpd/proftpd.conf
--- a/components/proftpd/proftpd.conf	Thu Jul 28 04:21:23 2011 -0700
+++ b/components/proftpd/proftpd.conf	Thu Jul 28 05:42:15 2011 -0700
@@ -21,7 +21,7 @@
 # Normally, we want files to be overwriteable.
 AllowOverwrite		on
 
-# Bar use of SITE CHMOD by default
+# Bar use of SITE CHMOD by default.
 <Limit SITE_CHMOD>
   DenyAll
 </Limit>
@@ -29,6 +29,9 @@
 # Make PAM the final authority on what gets authenticated.
 AuthOrder mod_auth_pam.c* mod_auth_unix.c
 
-# Use system libraries for user lookups
+# Use system libraries for user lookups.
 PersistentPasswd off
 
+# Root login must be enabled explicitly. It is not permitted by default.
+# Allow it only if you know what you are doing.
+#RootLogin on