gunnar: server/perl-kolab/perl-kolab/sbin kolab_bootstrap.in, 1.1, 1.2
cvs at kolab.org
cvs at kolab.org
Fri Mar 5 00:30:40 CET 2010
Author: gunnar
Update of /kolabrepository/server/perl-kolab/perl-kolab/sbin
In directory doto:/tmp/cvs-serv7851/perl-kolab/sbin
Modified Files:
kolab_bootstrap.in
Log Message:
Revert old fix for kolab/issue919 (kolab server has problems with some characters in passwords (rt#5558))
Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/perl-kolab/sbin/kolab_bootstrap.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab_bootstrap.in 16 Feb 2010 05:33:42 -0000 1.1
+++ kolab_bootstrap.in 4 Mar 2010 23:30:38 -0000 1.2
@@ -65,7 +65,6 @@
use Time::localtime;
use Digest::SHA1;
use MIME::Base64;
-use Encode;
# Reload only kolab.globals into our configuration.
Kolab::reloadConfig("@CONFIG_DIR@/kolab.globals", 1);
@@ -402,8 +401,8 @@
if ($bind_pw =~ /\@\@\@/) {
$bind_pw = `$Kolab::config{'bindir'}/openssl rand -base64 12`;
chomp $bind_pw;
- $bind_pw = Encode::encode_utf8(getUserInput("Please choose a manager password", $bind_pw));
- print " bind_pw : " . Encode::decode_utf8($bind_pw) . "\n";
+ $bind_pw = getUserInput("Please choose a manager password", $bind_pw);
+ print " bind_pw : $bind_pw\n";
$bind_pw_hash = hashPassword2($bind_pw);
}
@@ -441,7 +440,7 @@
chmod 0600, $kolab_config;
kolab_chown "$Kolab::config{'kolab_musr'}","$Kolab::config{'kolab_mgrp'}", $kolab_config;
print "IMPORTANT NOTE:\n";
- print "use login=manager and passwd=" . Encode::decode_utf8($bind_pw) . " when you log into the webinterface!\n\n";
+ print "use login=manager and passwd=$bind_pw when you log into the webinterface!\n\n";
}
# Set up slapd to replicate to slave server's kolabds
@@ -751,7 +750,7 @@
print "proceeding with base DN $base_dn\n";
$bind_dn = "cn=manager,cn=internal,$base_dn";
- $bind_pw = Encode::encode_utf8(getUserInput("Manager password"));
+ $bind_pw = getUserInput("Manager password");
$bind_pw_hash = hashPassword2($bind_pw);
my $confname = "$Kolab::config{'sasl_smtpconffile'}";
@@ -943,5 +942,5 @@
#system("@CONFIG_DIR@/kolab_sslcert.sh $fqdn");
print "kolab is now ready to run!\n";
print "please run '$Kolab::config{'KOLABRC'} rc all start'\n";
-print ("Use login=manager and passwd=" . Encode::decode_utf8($bind_pw) . " when you log into\n");
+print ("Use login=manager and passwd=$bind_pw when you log into\n");
print ("the webinterface https://$fqdn$Kolab::config{'kolab_wui'} !\n");
More information about the commits
mailing list