summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2007-10-17 17:57:13 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2007-10-17 17:57:13 (GMT)
commitd659f90336a71c69aee839b23f65ef147bf59d98 (patch)
treed3bc8db7ac2c97dd0252786cab9c83b70b07dcc4
parent589423e648799bc943b34d4cf5640c0509e1acf0 (diff)
downloadperl-Kolab-d659f90336a71c69aee839b23f65ef147bf59d98.tar.gz
Fix kolab/issue934 (Remove FTP FreeBusy Service (proftpd))
-rw-r--r--ChangeLog4
-rw-r--r--lib/Kolab.pm8
2 files changed, 4 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 87e94da..f8a1def 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-17 Thomas Arendsen Hein <thomas@intevation.de>
+
+ * lib/Kolab.pm: kolab/issue934 (Remove FTP FreeBusy Service (proftpd))
+
2007-08-01 Gunnar Wrobel <p@rdus.de>
Converted the perl-kolab package into a standard perl library.
diff --git a/lib/Kolab.pm b/lib/Kolab.pm
index b6b32a7..b824c9d 100644
--- a/lib/Kolab.pm
+++ b/lib/Kolab.pm
@@ -241,14 +241,6 @@ sub reloadConfig
# We now need to go through the list of all possible configuration variables
# and set the default values of those that were not overridden.
- # ProFTPd password
- if (exists $config{'proftpd-userPassword'}) {
- my $salt = substr($config{'proftpd-userPassword'}, 0, 2);
- $config{'proftpd-userPassword'} = crypt($config{'proftpd-userPassword'}, $salt);
- } else {
- $config{'proftpd-userPassword'} = '';
- }
-
$config{'fqdn'} = trim(`hostname`);
# connect to services at local address if binding to any interface,