atratsevskiy
Mike Hiretsky 13 years ago
parent 70a29a220e
commit 1d67af992b

@ -6,7 +6,7 @@ AUX calculate-server-2.1.14-fix_add_dns_rec.patch 649 RMD160 dbe869d596486428d10
AUX calculate-server-2.1.14-fix_dovecot.patch 502 RMD160 c7d4c76dc49a3894e7534572643e321696ae5a58 SHA1 1d62d3b5c9a5628cbb133bc615f8af06d6e844b5 SHA256 4f9ed8f74dd50244f1b6ac5f8a1b991a0f973fb2c05eac23e0509c2d31458baa
AUX calculate-server-2.1.14-remote_distfiles.patch 892 RMD160 8d6a74fa561dcb35749f823103231890a93572f5 SHA1 b9aacc5e6fa755eb12fed2f4cb34d8a6c0765a01 SHA256 3f01a01874c38e81a86940255b55fa250a2c0f85726fdd6974b4b9e3ac1bdc34
AUX calculate-server-2.1.14-rename_param.patch 1980 RMD160 2d5e449e1da1f9dc7f3c2ddf11125842309675c4 SHA1 75aab35370256629d82eca9347d5d1fc07706b2d SHA256 d09e00c52625b4320a753cc519250d396f92742181af2a6f7a95b060812cf99d
AUX calculate-server-2.1.15-fix_proftpd.patch 1028 RMD160 225573257cc27880ab2a3b44dd2915aaedac686f SHA1 a64037ff43a5d593e5b85660b15a98b86ee16808 SHA256 f38174665eb1b947f95a6eea304f6be702fef1b5507e6df04ba693bcfac5fbf3
AUX calculate-server-2.1.15-fix_proftpd.patch 920 RMD160 50f982911022ed4f063c386a8811e2f95ecc95ce SHA1 2cff58b77a28c823fdfc9401f3c92eefb4dd21e8 SHA256 42b8969e61bd4456812db8f164076b00d35f5f21daecf0d9dc89486738ce2a80
DIST calculate-server-2.1.13.tar.bz2 157717 RMD160 42d15a964a8c94774003d89ddc6bd834d20b1d5d SHA1 08e47e64aa8173b76a73693346d465ed62ac2ea1 SHA256 c748759f792c21dd28f2659bfeccf2a707c08f36a5d49766ceb6b922a98e930e
DIST calculate-server-2.1.14.tar.bz2 167957 RMD160 a2d349f1cd6a6107f7e32b79b5189e5a0530b440 SHA1 3f23fb09fb7b67f14d48c8ffb3edc03e5eef95a9 SHA256 3c5b4de78df05c545884995d50fd5b8b53c6d9742d91e699d8fd1d9020168e05
DIST calculate-server-2.1.15.tar.bz2 168350 RMD160 8b6723d9007f6ba73af0690ea8a49a3047ec6eff SHA1 ebda1375fd7dc95e4f4404f99d30f50d5788aa4e SHA256 3bc8f28dc3c583d1ec51d9653fc92d047c0f2064f3745a34195ba133cfc66d8c

@ -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

Loading…
Cancel
Save