gunnar: server/perl-kolab/sbin kolab_bootstrap.in,1.7.2.2,1.7.2.3

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/perl-kolab/sbin
In directory doto:/tmp/cvs-serv21120/perl-kolab/sbin

Modified Files:
      Tag: kolab_2_2_branch
	kolab_bootstrap.in 
Log Message:
 kolab/issue919 (kolab server has problems with some characters in passwords (rt#5558))

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/sbin/kolab_bootstrap.in,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- kolab_bootstrap.in	17 Nov 2009 17:12:35 -0000	1.7.2.2
+++ kolab_bootstrap.in	14 Dec 2009 05:03:49 -0000	1.7.2.3
@@ -65,6 +65,7 @@
 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);
@@ -384,8 +385,8 @@
     if ($bind_pw =~ /\@\@\@/) {
       $bind_pw = `$Kolab::config{'bindir'}/openssl rand -base64 12`;
       chomp $bind_pw;
-      $bind_pw = getUserInput("Please choose a manager password", $bind_pw);
-      print " bind_pw : $bind_pw\n";
+      $bind_pw = Encode::encode_utf8(getUserInput("Please choose a manager password", $bind_pw));
+      print " bind_pw : " . Encode::decode_utf8($bind_pw) . "\n";
       $bind_pw_hash = hashPassword2($bind_pw);
     }
 
@@ -423,7 +424,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=$bind_pw when you log into the webinterface!\n\n";
+    print "use login=manager and passwd=" . Encode::decode_utf8($bind_pw) . " when you log into the webinterface!\n\n";
   }
 
   # Set up slapd to replicate to slave server's kolabds
@@ -724,7 +725,7 @@
   print "proceeding with base DN $base_dn\n";
 
   $bind_dn = "cn=manager,cn=internal,$base_dn";
-  $bind_pw = getUserInput("Manager password");
+  $bind_pw = Encode::encode_utf8(getUserInput("Manager password"));
   $bind_pw_hash = hashPassword2($bind_pw);
 
   my $confname = "$Kolab::config{'sasl_smtpconffile'}";
@@ -916,5 +917,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=$bind_pw when you log into\n");
+print ("Use login=manager and passwd=" . Encode::decode_utf8($bind_pw) . " when you log into\n");
 print ("the webinterface https://$fqdn$Kolab::config{'kolab_wui'} !\n");