X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fmodules%2FGosaSupportDaemon.pm;h=b3a43167718f6a03a631abf084648b2af918c64e;hb=c7c87bf20a909ed7ff997aa879cd9146e74316af;hp=5ee469df9de11c15b1b59a8eeda74803bfa3f33d;hpb=be57516cc5eee1db5e0fdd13f75fe99d43bcfa71;p=gosa.git

diff --git a/gosa-si/modules/GosaSupportDaemon.pm b/gosa-si/modules/GosaSupportDaemon.pm
index 5ee469df9..b3a431677 100644
--- a/gosa-si/modules/GosaSupportDaemon.pm
+++ b/gosa-si/modules/GosaSupportDaemon.pm
@@ -524,7 +524,13 @@ sub import_events {
 
     if ($error == 0) {
         while (defined (my $event = readdir ($DIR))) {
-            if( $event eq "." || $event eq ".." ) { next; }  
+            if( $event eq "." || $event eq ".." || ($event =~ /^\.pm$/)) { next; }  
+
+			# Check config file to exclude disabled event plugins (i.e. Opsi)
+			if ($event eq "opsi_com.pm" &&  $main::opsi_enabled ne "true")  { 
+				&main::daemon_log("0 WARNING: opsi-module is installed but not enabled in config file, please set under section '[OPSI]': 'enabled=true'", 3);	
+				next; 
+			}
 
             # try to import event module
             eval{ require $event; };
@@ -672,9 +678,8 @@ sub get_local_ip_for_remote_ip {
                 last;
             }
         }
-    } else {
-		daemon_log("0 WARNING: get_local_ip_for_remote_ip() was called with a non-ip parameter: '$remote_ip'", 1);
-	}
+    } 
+
 	return $result;
 }
 
@@ -753,9 +758,11 @@ sub run_as {
 	}
 	my $cmd_line= "$sudo_cmd su - $uid -c '$command'";
 	open(PIPE, "$cmd_line |");
-	my $result = {'resultCode' => $?};
-	$result->{'command'} = $cmd_line;
+	my $result = {'command' => $cmd_line};
 	push @{$result->{'output'}}, <PIPE>;
+	close(PIPE);
+	my $exit_value = $? >> 8;
+	$result->{'resultCode'} = $exit_value;
 	return $result;
 }
 
@@ -835,7 +842,8 @@ sub check_opsi_res {
 }
 
 sub calc_timestamp {
-    my ($timestamp, $operation, $value) = @_ ;
+    my ($timestamp, $operation, $value, $entity) = @_ ;
+	$entity = defined $entity ? $entity : "seconds";
     my $res_timestamp = 0;
     
     $value = int($value);
@@ -850,12 +858,12 @@ sub calc_timestamp {
             );
 
     if ($operation eq "plus" || $operation eq "+") {
-        $dt->add( seconds => $value);
+        $dt->add($entity => $value);
         $res_timestamp = $dt->ymd('').$dt->hms('');
     }
 
     if ($operation eq "minus" || $operation eq "-") {
-        $dt->subtract(seconds => $value);
+        $dt->subtract($entity => $value);
         $res_timestamp = $dt->ymd('').$dt->hms('');
     }