index 47a077b7e158248cba816ab88881f364734943b9..b3a43167718f6a03a631abf084648b2af918c64e 100644 (file)
"create_xml_string",
"transform_msg2hash",
"get_time",
"create_xml_string",
"transform_msg2hash",
"get_time",
+ "get_utc_time",
"build_msg",
"db_res2xml",
"db_res2si_msg",
"build_msg",
"db_res2xml",
"db_res2si_msg",
"read_configfile",
"check_opsi_res",
"calc_timestamp",
"read_configfile",
"check_opsi_res",
"calc_timestamp",
+ "opsi_callobj2string",
);
@EXPORT = @functions;
use strict;
);
@EXPORT = @functions;
use strict;
sub get_time {
sub get_time {
- my ($seconds, $minutes, $hours, $monthday, $month,
- $year, $weekday, $yearday, $sommertime) = localtime(time);
- $hours = $hours < 10 ? $hours = "0".$hours : $hours;
- $minutes = $minutes < 10 ? $minutes = "0".$minutes : $minutes;
- $seconds = $seconds < 10 ? $seconds = "0".$seconds : $seconds;
- $month+=1;
- $month = $month < 10 ? $month = "0".$month : $month;
- $monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday;
- $year+=1900;
- return "$year$month$monthday$hours$minutes$seconds";
+ my ($seconds, $minutes, $hours, $monthday, $month,
+ $year, $weekday, $yearday, $sommertime) = localtime;
+ $hours = $hours < 10 ? $hours = "0".$hours : $hours;
+ $minutes = $minutes < 10 ? $minutes = "0".$minutes : $minutes;
+ $seconds = $seconds < 10 ? $seconds = "0".$seconds : $seconds;
+ $month+=1;
+ $month = $month < 10 ? $month = "0".$month : $month;
+ $monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday;
+ $year+=1900;
+ return "$year$month$monthday$hours$minutes$seconds";
+}
+
+sub get_utc_time {
+ my $utc_time = qx(date --utc +%Y%m%d%H%M%S);
+ $utc_time =~ s/\s$//;
+ return $utc_time;
}
}
if( $column_name eq "xmlmessage" ) {
$xml_content = &encode_base64($column_value);
} else {
if( $column_name eq "xmlmessage" ) {
$xml_content = &encode_base64($column_value);
} else {
- $xml_content = $column_value;
+ $xml_content = defined $column_value ? $column_value : "";
}
$xml .= $xml_content;
$xml .= "</$column_name>";
}
$xml .= $xml_content;
$xml .= "</$column_name>";
if ($error == 0) {
while (defined (my $event = readdir ($DIR))) {
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; };
# try to import event module
eval{ require $event; };
last;
}
}
last;
}
}
- } else {
- daemon_log("0 WARNING: get_local_ip_for_remote_ip() was called with a non-ip parameter: '$remote_ip'", 1);
- }
+ }
+
return $result;
}
return $result;
}
}
my $cmd_line= "$sudo_cmd su - $uid -c '$command'";
open(PIPE, "$cmd_line |");
}
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>;
push @{$result->{'output'}}, <PIPE>;
+ close(PIPE);
+ my $exit_value = $? >> 8;
+ $result->{'resultCode'} = $exit_value;
return $result;
}
return $result;
}
my $cfg;
if( defined( $cfg_file) && ( (-s $cfg_file) > 0 )) {
if( -r $cfg_file ) {
my $cfg;
if( defined( $cfg_file) && ( (-s $cfg_file) > 0 )) {
if( -r $cfg_file ) {
- $cfg = Config::IniFiles->new( -file => $cfg_file );
+ $cfg = Config::IniFiles->new( -file => $cfg_file, -nocase => 1 );
} else {
print STDERR "Couldn't read config file!";
}
} else {
print STDERR "Couldn't read config file!";
}
}
sub calc_timestamp {
}
sub calc_timestamp {
- my ($timestamp, $operation, $value) = @_ ;
+ my ($timestamp, $operation, $value, $entity) = @_ ;
+ $entity = defined $entity ? $entity : "seconds";
my $res_timestamp = 0;
$value = int($value);
my $res_timestamp = 0;
$value = int($value);
);
if ($operation eq "plus" || $operation eq "+") {
);
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 "-") {
$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('');
}
return $res_timestamp;
}
$res_timestamp = $dt->ymd('').$dt->hms('');
}
return $res_timestamp;
}
+sub opsi_callobj2string {
+ my ($callobj) = @_;
+ my @callobj_string;
+ while(my ($key, $value) = each(%$callobj)) {
+ my $value_string = "";
+ if (ref($value) eq "ARRAY") {
+ $value_string = join(",", @$value);
+ } else {
+ $value_string = $value;
+ }
+ push(@callobj_string, "$key=$value_string")
+ }
+ return join(", ", @callobj_string);
+}
1;
1;