steffen: server/kolab/kolab kolab_bootstrap,1.69,1.70

cvs at intevation.de cvs at intevation.de
Tue Oct 26 04:05:49 CEST 2004


Author: steffen

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

Modified Files:
	kolab_bootstrap 
Log Message:
fix for issue479 (trailing newline in calendar passwd)

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_bootstrap,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- kolab_bootstrap	25 Oct 2004 13:57:15 -0000	1.69
+++ kolab_bootstrap	26 Oct 2004 02:05:47 -0000	1.70
@@ -301,10 +301,11 @@
     }
     if ($calendar_dn =~ /\@\@\@/) {
       $calendar_dn =~ s/\@\@\@kolab_basedn\@\@\@/$base_dn/g;
+      chomp $calendar_dn;
     }
     if ($calendar_pw =~ /\@\@\@/) {
       $calendar_pw = `$kolab_prefix/bin/openssl passwd calendar`;
-      chomp $php_pw;
+      chomp $calendar_pw;
     }
 
     $fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";





More information about the commits mailing list