* gosa-si-server-nobus

* under construction

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11113 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-si/debian/gosa-si-server.install b/gosa-si/debian/gosa-si-server.install
index 1dd8d8661c5a4936476b9931dbb2612124931a1d..920b87f380ffa3f24def1e7af8c0d9976ac99e9e 100644 (file)
--- a/gosa-si/debian/gosa-si-server.install
+++ b/gosa-si/debian/gosa-si-server.install
@@ -10,7 +10,7 @@ modules/ServerPackages.pm         usr/lib/gosa-si/modules
 server/events/gosaTriggered.pm                   usr/lib/gosa-si/server/GosaPackages
 server/events/siTriggered.pm        usr/lib/gosa-si/server/ClientPackages
 server/events/clMessages.pm         usr/lib/gosa-si/server/ClientPackages
-server/events/databases.pm          usr/lib/gosa-si/server/ClientPackages
+server/events/databases.pm          usr/lib/gosa-si/server/GosaPackages
 server/events/krb5.pm               usr/lib/gosa-si/server/GosaPackages
 server/events/logHandling.pm        usr/lib/gosa-si/server/ClientPackages
 server/events/server_server_com.pm  usr/lib/gosa-si/server/ServerPackages

diff --git a/gosa-si/gosa-si-server-nobus b/gosa-si/gosa-si-server-nobus
index 624c7b808cd8bed8cf26521d1a7a6c24b8270bce..ac627c6593a6363a70378531ff9ad8430a9eb4c0 100755 (executable)
--- a/gosa-si/gosa-si-server-nobus
+++ b/gosa-si/gosa-si-server-nobus
@@ -1054,7 +1054,8 @@ sub msg_to_decrypt {
         }
         $error++;
     }
-    
+
+
     my $header;
     my $target;
     my $source;
@@ -1067,6 +1068,12 @@ sub msg_to_decrypt {
         $target = @{$msg_hash->{'target'}}[0];
         $source = @{$msg_hash->{'source'}}[0];
 
+        # target and source is equal to GOSA -> process here
+        if (not $done) {
+            if ($target eq "GOSA" && $source eq "GOSA") {
+                $done = 1;                    
+            }
+        }
 
         # target is own address without forward_to_gosa-tag -> process here
         if (not $done) {
@@ -1088,6 +1095,7 @@ sub msg_to_decrypt {
             }
         }
 
+
         # if message should be processed here -> add message to incoming_db
         if ($done) {
             my $res = $incoming_db->add_dbentry( {table=>$incoming_tn,
@@ -1160,8 +1168,11 @@ sub msg_to_decrypt {
             }
         }
 
-
+        if (not $done) {
+            daemon_log("$session_id ERROR: do not know what to do with this message: $msg", 1);
+        }
     }
+
     return;
 }
 

diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm
index 2986f3b292be6007cf0b7ab3b3b66a95cf18b05c..c744f9b4c5e45e1f8b6ffe123d61b51148b5f3f7 100644 (file)
--- a/gosa-si/modules/GosaPackages.pm
+++ b/gosa-si/modules/GosaPackages.pm
@@ -227,36 +227,6 @@ sub get_ip {
 }
 
 
-#sub import_events {
-#    if (not -e $event_dir) {
-#        &main::daemon_log("G ERROR: cannot find directory or directory is not readable: $event_dir", 1);   
-#    }
-#    opendir (DIR, $event_dir) or die "ERROR while loading gosa-si-events from directory $event_dir : $!\n";
-#
-#    while (defined (my $event = readdir (DIR))) {
-#        if( $event eq "." || $event eq ".." ) { next; }   
-#        if( $event eq "siTriggered.pm" ) { next; }                  # SI specific events not needed in GosaPackages.pm
-#        if( $event eq "clMessages.pm" ) { next; }                   # SI specific events not needed in GosaPackages.pm
-#
-#        eval{ require $event; };
-#        if( $@ ) {
-#            &main::daemon_log("G ERROR: import of event module '$event' failed", 1);
-#            &main::daemon_log("$@", 1);
-#            next;
-#        }
-#
-#        $event =~ /(\S*?).pm$/;
-#        my $event_module = $1;
-#        my $events_l = eval( $1."::get_events()") ;
-#        foreach my $event_name (@{$events_l}) {
-#            $event_hash->{$event_name} = $event_module;
-#        }
-#        my $events_string = join( ", ", @{$events_l});
-#        &main::daemon_log("G DEBUG: GosaPackages from '$1' imported events $events_string", 8);
-#    }
-#}
-
-
 #===  FUNCTION  ================================================================
 #         NAME:  process_incoming_msg
 #   PARAMETERS:  crypted_msg - string - incoming crypted message

diff --git a/gosa-si/tests/client.php b/gosa-si/tests/client.php
index 2be71dd8a91248863a06afc19cf085dda8cf8f0b..461ce429399b6957f56c41736c1b87dea590fe66 100755 (executable)
--- a/gosa-si/tests/client.php
+++ b/gosa-si/tests/client.php
@@ -105,8 +105,8 @@ for($count = 1; $count <= $zahl; $count++)
     #$data = "<xml> <header>gosa_krb5_create_principal</header> <target>00:01:6c:9d:aa:16</target> <principal>horst@WIRECARD.SYS</principal><source>GOSA</source><max_life>666</max_life></xml>"; 
     #$data = "<xml> <header>gosa_krb5_modify_principal</header> <target>00:01:6c:9d:b9:fa</target> <principal>horst@WIRECARD.SYS</principal><source>GOSA</source><max_life>666</max_life></xml>"; 
 
-    #$data = "<xml> <header>gosa_new_ping</header> <target>10.89.1.31:20083</target> <source>GOSA</source> <forward_to_gosa></forward_to_gosa> </xml>";
-    $data = "<xml> <header>gosa_new_ping</header> <target>00:0c:29:02:e5:4d</target> <source>GOSA</source> </xml>";
+    $data = "<xml><header>gosa_query_fai_server</header><source>GOSA</source> <target>10.89.1.131:20081</target></xml>";
+    #$data = "<xml> <header>gosa_new_ping</header> <target>00:0c:29:02:e5:4d</target> <source>GOSA</source> </xml>";
 
     $sock->write($data);
     $answer = "nothing";