From: janw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 4 Sep 2008 12:18:07 +0000 (+0000)
Subject: Moved read_configfile to local_read_configfile.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2efe349f7b91473e27d638132f391cb2c0ca1fc0;p=gosa.git

Moved read_configfile to local_read_configfile.


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

diff --git a/gosa-si/modules/ArpHandler.pm b/gosa-si/modules/ArpHandler.pm
index f8ab36107..f44d72976 100644
--- a/gosa-si/modules/ArpHandler.pm
+++ b/gosa-si/modules/ArpHandler.pm
@@ -40,16 +40,16 @@ my $ldap;
 
 my %cfg_defaults =
 (
-	"ArpHandler" => {
-		"enabled"           => [\$arp_enabled,         "true"],
-		"interface"       => [\$arp_interface,    "all"],
-	},
-	"server" => {
-		"ldap-uri"            => [\$ldap_uri,            ""],
-		"ldap-base"           => [\$ldap_base,           ""],
-		"ldap-admin-dn"       => [\$ldap_admin_dn,       ""],
-		"ldap-admin-password" => [\$ldap_admin_password, ""],
-	},
+    "ArpHandler" => {
+        "enabled"             => [\$arp_enabled,         "true"],
+        "interface"           => [\$arp_interface,       "all"],
+    },
+    "server" => {
+        "ldap-uri"            => [\$ldap_uri,            ""],
+        "ldap-base"           => [\$ldap_base,           ""],
+        "ldap-admin-dn"       => [\$ldap_admin_dn,       ""],
+        "ldap-admin-password" => [\$ldap_admin_password, ""],
+    },
 );
 
 #===  FUNCTION  ================================================================
@@ -58,7 +58,7 @@ my %cfg_defaults =
 #      RETURNS:  nothing
 #  DESCRIPTION:  read cfg_file and set variables
 #===============================================================================
-sub read_configfile {
+sub local_read_configfile {
 	my $cfg;
 	if( defined( $main::cfg_file) && ( (-s $main::cfg_file) > 0 )) {
 		if( -r $main::cfg_file ) {
@@ -82,7 +82,7 @@ sub get_module_info {
 		undef,
 	);
 
-	&read_configfile();
+	&local_read_configfile();
 	# Don't start if some of the modules are missing
 	if(($arp_enabled eq 'true') && $start_service) {
 		if($lookup_vendor) {