steffen: server/kolab/kolab kolab_bootstrap,1.61,1.62

cvs at intevation.de cvs at intevation.de
Tue Sep 7 14:48:57 CEST 2004


Author: steffen

Update of /kolabrepository/server/kolab/kolab
In directory doto:/tmp/cvs-serv5207/kolab

Modified Files:
	kolab_bootstrap 
Log Message:
fix for issue380

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_bootstrap,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- kolab_bootstrap	6 Sep 2004 14:00:36 -0000	1.61
+++ kolab_bootstrap	7 Sep 2004 12:48:55 -0000	1.62
@@ -29,6 +29,7 @@
 
 my $kolab_prefix = "@l_prefix@";
 my $kolab_config = $kolab_prefix."/etc/kolab/kolab.conf";
+my %kolab_config;
 
 ##### Utility Functions
 
@@ -64,7 +65,7 @@
 # Hash a password
 sub hashPassword {
   my $pw = shift;
-  my $hashcmd = $config{'prefix'}."/sbin/slappasswd -s '".$pw."'";
+  my $hashcmd = $kolab_config{'prefix'}."/sbin/slappasswd -s '".$pw."'";
   chomp($pw);
   return $pw;
 }
@@ -189,7 +190,6 @@
 
 my $fd = IO::File->new($kolab_config, "r")
    || die "could not open $kolab_config";
-my %kolab_config;
 foreach (<$fd>) {
    if (/(.*) : (.*)/) {
       $kolab_config{$1} = $2;





More information about the commits mailing list