Index: Kolab.pm
===================================================================
RCS file: /home/kroupware/jail/kolabrepository/server/perl-kolab/Kolab/Kolab.pm,v
retrieving revision 1.23
diff -u -r1.23 Kolab.pm
--- Kolab.pm	11 Jun 2005 09:36:11 -0000	1.23
+++ Kolab.pm	20 Jun 2005 13:52:32 -0000
@@ -127,7 +128,7 @@
 
     # Make a hash of the bind password available too
     if( !exists $config{'bind_pw_hash'} ) {
-      my $hashcmd = $config{'prefix'}."$ap::config->{sbindir}/slappasswd -s '".$config{'bind_pw'}."'";
+      my $hashcmd = $config{'prefix'} . $ap::config->{sbindir} . "/slappasswd -s '".$config{'bind_pw'}."'";
       $config{'bind_pw_hash'} = `$hashcmd`;
       chomp($config{'bind_pw_hash'});
     }
@@ -351,49 +352,49 @@
 
     if ($haschanged{'slapd'}) {
         &log('K', 'Restarting OpenLDAP...');
-        system("$ap::config->{sbindir}/slurpd restart &");
+        system($prefix . "$ap::config->{sbindir}/slurpd restart &");
     }
 
     if ($haschanged{'saslauthd'}) {
         &log('K', 'Restarting SASLAuthd...');
-        system("$ap::config->{sbindir}/rcsaslauthd stop; sleep 1; $ap::config->{sbindir}/rcsaslauthd -a ldap -n 5");
+        system($prefix . "$ap::config->{sbindir}/rcsaslauthd stop; sleep 1; $ap::config->{sbindir}/rcsaslauthd -a ldap -n 5");
     }
 
     if ($haschanged{'apache'}) {
         &log('K', 'Reloading Apache...');
-        system("$ap::config->{sbindir}/apache2ctl graceful");
+        system($prefix . "$ap::config->{sbindir}/apache2ctl graceful");
     }
 
     if ($haschanged{'postfix'}) {
         &log('K', 'Reloading Postfix...');
-        system("$ap::config->{sbindir}/rcpostfix reload");
+        system($prefix . "$ap::config->{sbindir}/rcpostfix reload");
     }
 
     if ($haschanged{'imapd'}) {
         &log('K', 'Restarting imapd...');
-        system("$ap::config->{sbindir}/rccyrus restart");
+        system($prefix . "$ap::config->{sbindir}/rccyrus restart");
     }
 
     if ($haschanged{'amavisd'}) {
         &log('K', 'Restarting amavisd...');
-        system("$ap::config->{sbindir}/rcamavisd restart");
+        system($prefix . "$ap::config->{sbindir}/rcamavisd restart");
     }
 
     if ($haschanged{'clamav'}) {
         &log('K', 'Restarting clamav...');
-        system("$ap::config->{sbindir}/clamd restart");
+        system($prefix . "$ap::config->{sbindir}/clamd restart");
     }
 
     if ($config{'proftpd-ftp'} =~ /true/i) {
         Kolab::log('K', 'Starting ProFTPd if not running');
-        system("$ap::config->{bindir}/openpkg rc proftpd start");
+        system($prefix . "$ap::config->{bindir}/openpkg rc proftpd start");
         if ($haschanged{'proftpd'}) {
             &log('K', 'Reloading ProFTPd...');
-            kill('SIGHUP', `cat $ap::config->{localstatedir}/proftpd/proftpd.pid`);
+            kill('SIGHUP', `cat $prefix$ap::config->{localstatedir}/proftpd/proftpd.pid`);
         }
     } else {
         &log('K', 'Stopping ProFTPd, if running...');
-        system("$ap::config->{bindir}/openpkg rc proftpd stop");
+        system($prefix . "$ap::config->{bindir}/openpkg rc proftpd stop");
     }
 
     %Kolab::Conf::haschanged = ();