From: rettenbe Date: Wed, 5 Dec 2007 15:33:03 +0000 (+0000) Subject: update for testing X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2aa24e57a2831f6953414bd7f67c89a98d6e9614;p=gosa.git update for testing unstable!!! git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8024 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/contrib/daemon/gosa-sc.cfg b/contrib/daemon/gosa-sc.cfg index fc1b6a0f2..acc488257 100644 --- a/contrib/daemon/gosa-sc.cfg +++ b/contrib/daemon/gosa-sc.cfg @@ -3,9 +3,7 @@ log_file = /var/log/gosa-sc.log pid_file = /var/run/gosa-sc.pid [client] -client_ip = 10.89.1.155 client_port = 10011 -mac_address = 00:1B:77:04:8A:6C [server] server_ip = 10.89.1.155 diff --git a/contrib/daemon/gosa-sd-bus.cfg b/contrib/daemon/gosa-sd-bus.cfg index 1fd58e18b..46a9b9327 100644 --- a/contrib/daemon/gosa-sd-bus.cfg +++ b/contrib/daemon/gosa-sd-bus.cfg @@ -4,7 +4,8 @@ pid_file = /var/run/gosa-sd-bus.pid [bus] bus_activ = on -bus_passwd = tester +bus_passwd = hallali +bus_ip = 10.89.1.155 bus_port = 10000 child_max = 10 child_min = 2 diff --git a/contrib/daemon/gosa-sd.cfg b/contrib/daemon/gosa-sd.cfg index 0dbb8c552..3ccaaaba7 100644 --- a/contrib/daemon/gosa-sd.cfg +++ b/contrib/daemon/gosa-sd.cfg @@ -4,7 +4,7 @@ pid_file = /var/run/gosa-sd.pid [bus] bus_activ = on -bus_passwd = tester +bus_passwd = hallali bus_ip = 10.89.1.155 bus_port = 10000 child_max = 10 @@ -19,15 +19,13 @@ server_passwd = tester max_clients = 5 [arp] -arp_activ = on +arp_activ = off arp_fifo_path = /etc/gosad/fifo/arp_fifo [gosa] gosa_activ = on gosa_ip = 10.89.1.155 gosa_port = 9999 - # passwd questions to gosad has to be crypted with gosa_passwd = ferdinand_frost - # seconds to wait for an answer from gosad gosa_timeout = 5 diff --git a/contrib/daemon/modules/ServerPackages.pm b/contrib/daemon/modules/ServerPackages.pm index cb0c625d0..80d4c54fc 100644 --- a/contrib/daemon/modules/ServerPackages.pm +++ b/contrib/daemon/modules/ServerPackages.pm @@ -8,6 +8,7 @@ use Exporter; use strict; use warnings; +use Data::Dumper; BEGIN{ @@ -107,7 +108,10 @@ sub process_incoming_msg { &main::daemon_log("ServerPackage: key_passwd: $key_passwd", 7); my $key_cipher = &main::create_ciphering($key_passwd); $msg = &main::decrypt_msg($crypted_msg, $key_cipher); + &main::daemon_log("DEBUG: ServerPackages: decrypted msg: $msg", 7); $msg_hash = $main::xml->XMLin($msg, ForceArray=>1); + my $tmp = printf Dumper $msg_hash; + &main::daemon_log("DEBUG: ServerPackages: xml hash: $tmp", 7); }; if($@) { &main::daemon_log("ServerPackage: key raise error: $@", 7);