From 47bf704076f4fda6b78b854af47941512b469b99 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 11 Feb 2008 17:19:17 +0000
Subject: [PATCH] Removed duplicated register functions

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8843 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-si/client/events/registered.pm | 55 -----------------------------
 gosa-si/gosa-si-client              |  2 +-
 2 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 gosa-si/client/events/registered.pm

diff --git a/gosa-si/client/events/registered.pm b/gosa-si/client/events/registered.pm
deleted file mode 100644
index d51d25194..000000000
--- a/gosa-si/client/events/registered.pm
+++ /dev/null
@@ -1,55 +0,0 @@
-package registered;
-use Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(get_events registered set_activated_for_installation);
-
-
-use strict;
-use warnings;
-use Data::Dumper;
-use Fcntl;
-
-BEGIN {}
-
-END {}
-
-### Start ######################################################################
-
-
-sub get_events {
-    my @events = ('registered', 'set_activated_for_installation');
-    return \@events;
-}
-
-sub registered {
-    my ($msg, $msg_hash) = @_ ;
-    my $header = @{$msg_hash->{'header'}}[0];
-   
-    if( $header eq "registered" ) {
-        my $source = @{$msg_hash->{'source'}}[0];
-        &main::daemon_log("registration at $source",1);
-    }
-    
-    # set registration_flag to true 
-    return 0;
-
-}
-
-
-sub set_activated_for_installation {
-    my ($msg, $msg_hash) = @_ ;
- my $header = @{$msg_hash->{'header'}}[0];
- my $target = @{$msg_hash->{'target'}}[0];
- my $source = @{$msg_hash->{'source'}}[0];
-
-    my $Datei = "/tmp/set_activated_for_installation";
-    open(DATEI, ">$Datei");
-    print DATEI "set_activated_for_installation\n";
-    close DATEI;
-    
-    return 0;
-}
-
-
-
-1;
diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index 79cccbf55..de1958c15 100755
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -61,7 +61,6 @@ our $REGISTERED = 0;
 "general" =>
     {"log-file"           => [\$log_file, "/var/run/".$0.".log"],
     "pid-file"            => [\$pid_file, "/var/run/".$0.".pid"],
-    "fai-logpath"         => [\$fai_logpath, "/var/log/fai/fai.log"],
     },
 "client" => 
     {"port"        => [\$client_port, "20083"],
@@ -72,6 +71,7 @@ our $REGISTERED = 0;
      "ldap-config"        => [\$ldap_config, "/etc/ldap/ldap.conf"],
      "pam-config"         => [\$pam_config, "/etc/pam_ldap.conf"],
      "nss-config"         => [\$nss_config, "/etc/libnss_ldap.conf"],
+     "fai-logpath"         => [\$fai_logpath, "/var/log/fai/fai.log"],
     },
 "server" => {
     "ip"          => [\$server_ip, "127.0.0.1"],
-- 
2.30.2