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 fc1b6a0f2b564f722ab0dc54f475c03678b5ed2b..acc4882579141d94e344ea2fe542cff60d2f2087 100644 (file)
--- 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 1fd58e18b8ac8ab3cf33b096ba690d64d8c24e25..46a9b932756c00a9eb366556f2d95379b1abad85 100644 (file)
--- 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 0dbb8c552fe6a0605b959e08342291ba6a61d75e..3ccaaaba7957f725b7a43b1b0063289ac5437af4 100644 (file)
--- 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 cb0c625d0fafab2b48c83374bbed3c9a0a6387d9..80d4c54fc05019278593b86a6bab86e22998b88a 100644 (file)
--- 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);