steffen: server/kolabd/kolabd kolab_bootstrap, 1.7, 1.8 kolabd, 1.1.1.1, 1.2 kolabpasswd, 1.3, 1.4

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv31429/kolabd

Modified Files:
	kolab_bootstrap kolabd kolabpasswd 
Log Message:
moved superlog to Util and made bootstrap and kolabpasswd chown kolab.conf to kolab

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolab_bootstrap	15 Dec 2004 00:22:42 -0000	1.7
+++ kolab_bootstrap	22 Dec 2004 13:50:03 -0000	1.8
@@ -119,6 +119,17 @@
     or die "system $arg failed: $?";
 };
 
+# Usable chown
+sub kolab_chown {
+    my $u = shift;
+    my $g = shift;
+    my $uid = getpwnam($u);
+    my $gid = getgrnam($g);
+    while( my $file = shift ) {
+	chown $uid,$gid,$file;
+    }
+}
+
 # Fetch entry from ldap server or create new entry of none exist
 sub newOrExistingLDAPEntry {
   my $ldap = shift;
@@ -324,6 +335,7 @@
     undef $fd;
     print "done modifying $kolab_config\n\n";
     chmod 0600, $kolab_config;
+    kolab_chown "@l_musr@","@l_mgrp@",$kolab_config;
     print "IMPORTANT NOTE:\n";
     print "use login=manager and passwd=$bind_pw when you log into the webinterface!\n\n";
   }
@@ -623,7 +635,10 @@
   # For now we just connect to the remote slapd
  SLAVESTART:
   print "Now some information about the master LDAP server is required:\n\n";
-  do { $ldap_uri = getUserInput("URI of master LDAP server (for example ldaps://host.example.com)"); } until $ldap_uri;
+  do { 
+      $ldap_uri = getUserInput("URI of master LDAP server (for example ldaps://host.example.com)", 
+			       $ldap_uri);
+  } until $ldap_uri;
   my $ldapuri = URI->new($ldap_uri) || warn "error: could not parse given uri";
   if( $ldapuri ) {
     $base_dn = join( ',', map { "dc=$_" } split /\./, $ldapuri->host() );
@@ -703,7 +718,8 @@
   undef $fd;
   print "done modifying $kolab_config\n\n";
   chmod 0600, $kolab_config;
-  
+  kolab_chown "@l_musr@","@l_mgrp@",$kolab_config;
+
   print << 'EOS';
 Now the master server needs to be stopped briefly while the contents of the LDAP database
 is copied over to this slave. Please make sure that this slave is entered into the list 

Index: kolabd
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- kolabd	23 Nov 2004 20:26:47 -0000	1.1.1.1
+++ kolabd	22 Dec 2004 13:50:03 -0000	1.2
@@ -4,7 +4,7 @@
 ##  Copyright (c) 2004  Klaraelvdalens Datakonsult AB
 ##  Copyright (c) 2003  Code Fusion cc
 ##
-##    Writen by Stuart Bingë  <s.binge at codefusion.co.za>
+##    Writen by Stuart Bing?<s.binge at codefusion.co.za>
 ##    Portions based on work by the following people:
 ##
 ##      (c) 2003  Tassilo Erlewein  <tassilo.erlewein at erfrakon.de>
@@ -59,7 +59,7 @@
 
 sub sigInt
 {
-    Kolab::superLog('Kolab is shutting down');
+    Kolab::Util::superLog('Kolab is shutting down');
 
     Kolab::log('K', 'SIGINT/SIGTERM detected, kill()ing children');
 
@@ -147,7 +147,7 @@
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 ';
 
-Kolab::superLog('Kolab is starting up');
+Kolab::Util::superLog('Kolab is starting up');
 
 eval {
   Kolab::LDAP::startup;

Index: kolabpasswd
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabpasswd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolabpasswd	14 Dec 2004 20:47:19 -0000	1.3
+++ kolabpasswd	22 Dec 2004 13:50:03 -0000	1.4
@@ -134,6 +134,7 @@
 
 # move temporary file to kolab master config
 rename($tmpfilename,$kolabconfname) || die "Error: could not install new $kolabconfname";
+system("chown @l_musr@, at l_mgrp@ $kolabconfname");
 
 print "Password changed successfully, please be patient...\n";