thomas: server/perl-kolab/lib Kolab.pm,1.6,1.7

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/perl-kolab/lib
In directory doto:/tmp/cvs-serv9800/perl-kolab/lib

Modified Files:
	Kolab.pm 
Log Message:
Fix kolab/issue934 (Remove FTP FreeBusy Service (proftpd))


Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Kolab.pm	15 Oct 2007 13:59:19 -0000	1.6
+++ Kolab.pm	17 Oct 2007 17:57:13 -0000	1.7
@@ -241,14 +241,6 @@
     # 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,