|
|
|
@ -1,14 +1,14 @@
|
|
|
|
|
commit 2ae7a6694734a9cccf3abbb4c53338ae440bbe1b
|
|
|
|
|
commit 6c2103d92b03e38d28589531e9c29d84709ffb57
|
|
|
|
|
Author: Mike Hiretsky <mh@calculate.ru>
|
|
|
|
|
Date: Tue Dec 13 10:19:17 2011 +0400
|
|
|
|
|
|
|
|
|
|
Fix proftpd.conf
|
|
|
|
|
|
|
|
|
|
diff --git a/profile/ftp/etc/proftpd/proftpd.conf b/profile/ftp/etc/proftpd/proftpd.conf
|
|
|
|
|
index bbf59dc..dca4e0b 100644
|
|
|
|
|
index bbf59dc..feff794 100644
|
|
|
|
|
--- a/profile/ftp/etc/proftpd/proftpd.conf
|
|
|
|
|
+++ b/profile/ftp/etc/proftpd/proftpd.conf
|
|
|
|
|
@@ -69,9 +69,20 @@ DefaultRoot #-sr_ftp_path-#
|
|
|
|
|
@@ -69,9 +69,16 @@ DefaultRoot #-sr_ftp_path-#
|
|
|
|
|
</Anonymous>
|
|
|
|
|
|
|
|
|
|
LDAPServer #-os_net_hostname-#.#-os_net_domain-#
|
|
|
|
@ -16,15 +16,11 @@ index bbf59dc..dca4e0b 100644
|
|
|
|
|
LDAPDNInfo "#-ld_ftp_dn-#" #-ld_ftp_pw-#
|
|
|
|
|
LDAPAuthBinds on
|
|
|
|
|
LDAPDoAuth on "uid=%v,ou=Users,#-ld_ftp_dn-#"
|
|
|
|
|
+!LDAPBindDN del
|
|
|
|
|
+!LDAPUsers del
|
|
|
|
|
+#pkg#
|
|
|
|
|
+#?pkg(net-ftp/proftpd)>=1.3.4#
|
|
|
|
|
+LDAPBindDN "#-ld_ftp_dn-#" #-ld_ftp_pw-#
|
|
|
|
|
+LDAPAuthBinds on
|
|
|
|
|
+LDAPUsers "uid=%v,ou=Users,#-ld_ftp_dn-#" (uid=%v)
|
|
|
|
|
+!LDAPDNInfo del
|
|
|
|
|
+!LDAPDoAuth del
|
|
|
|
|
+#pkg#
|
|
|
|
|
LDAPDefaultAuthScheme SSHA
|
|
|
|
|
LDAPGenerateHomedir off
|
|
|
|
|