From a89c3c0ce8a620fd111f4decb322576b3a21f828 Mon Sep 17 00:00:00 2001 From: rettenbe Date: Tue, 19 Feb 2008 14:26:21 +0000 Subject: [PATCH] renamed function git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8958 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-si/debian/gosa-si-server.dirs | 1 + gosa-si/modules/GosaPackages.pm | 2 +- gosa-si/modules/GosaSupportDaemon.pm | 24 ++++++++++++++++++++---- gosa-si/modules/SIPackages.pm | 4 ++-- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/gosa-si/debian/gosa-si-server.dirs b/gosa-si/debian/gosa-si-server.dirs index be099ffcf..bae080a08 100644 --- a/gosa-si/debian/gosa-si-server.dirs +++ b/gosa-si/debian/gosa-si-server.dirs @@ -2,3 +2,4 @@ usr/sbin usr/lib/gosa-si/modules usr/lib/gosa-si/server/events etc/gosa-si +/var/log/fai diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm index d53227ef6..bcf883949 100644 --- a/gosa-si/modules/GosaPackages.pm +++ b/gosa-si/modules/GosaPackages.pm @@ -316,7 +316,7 @@ sub process_gosa_msg { # Forward messages to all known servers as "trigger_wake" my $in_hash= &transform_msg2hash($msg); my %data = ( 'macAddress' => \@{$in_hash->{macAddress}} ); - $out_msg = &send_msg("trigger_wake", $server_address, "KNOWN_SERVER", \%data); + $out_msg = &build_msg("trigger_wake", $server_address, "KNOWN_SERVER", \%data); } else { # msg could not be assigned to core function # maybe it is an eventa diff --git a/gosa-si/modules/GosaSupportDaemon.pm b/gosa-si/modules/GosaSupportDaemon.pm index ccdcea151..ffe43332f 100644 --- a/gosa-si/modules/GosaSupportDaemon.pm +++ b/gosa-si/modules/GosaSupportDaemon.pm @@ -2,8 +2,24 @@ package GOSA::GosaSupportDaemon; use Exporter; @ISA = qw(Exporter); -@EXPORT = qw(create_xml_hash get_content_from_xml_hash add_content2xml_hash create_xml_string encrypt_msg decrypt_msg create_ciphering transform_msg2hash get_time send_msg get_where_statement get_select_statement get_update_statement get_limit_statement get_orderby_statement); - +my @functions = ( + "create_xml_hash", + "get_content_from_xml_hash", + "add_content2xml_hash", + "create_xml_string", + "encrypt_msg", + "decrypt_msg", + "create_ciphering", + "transform_msg2hash", + "get_time", + "build_msg", + "get_where_statement", + "get_select_statement", + "get_update_statement", + "get_limit_statement", + "get_orderby_statement", + ); +@EXPORT = @functions; use strict; use warnings; use IO::Socket::INET; @@ -247,7 +263,7 @@ sub get_time { #=== FUNCTION ================================================================ -# NAME: send_msg +# NAME: build_msg # DESCRIPTION: Send a message to a destination # PARAMETERS: [header] Name of the header # [from] sender ip @@ -256,7 +272,7 @@ sub get_time { # package # RETURNS: nothing #=============================================================================== -sub send_msg ($$$$) { +sub build_msg ($$$$) { my ($header, $from, $to, $data) = @_; my $out_hash = &create_xml_hash($header, $from, $to); diff --git a/gosa-si/modules/SIPackages.pm b/gosa-si/modules/SIPackages.pm index a5e2d06b5..672ad4d62 100644 --- a/gosa-si/modules/SIPackages.pm +++ b/gosa-si/modules/SIPackages.pm @@ -850,7 +850,7 @@ sub new_ldap_config { $mesg = $ldap->unbind; # Send information - return send_msg("new_ldap_config", $server_address, $address, \%data); + return &build_msg("new_ldap_config", $server_address, $address, \%data); } sub process_detected_hardware { @@ -1095,7 +1095,7 @@ sub hardware_config { &main::daemon_log("Send detect_hardware message to $address", 4); # Send information - return send_msg("detect_hardware", $server_address, $address, \%data); + return &build_msg("detect_hardware", $server_address, $address, \%data); } sub server_matches { -- 2.30.2