From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Sat, 14 May 2005 16:02:54 +0000 (+0000)
Subject: Fixed problem with base
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=501f05bdddf6c5cc78b5579f3ccffa03b297d031;p=gosa.git

Fixed problem with base


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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 0be337faf..587d856f0 100644
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -164,14 +164,13 @@
 			sambaversion="{SAMBAVERSION}"
 			{SID}
 			{RIDBASE}
-			base="{LDAPBASE}"
 			mailMethod="{MAILMETHOD}"
 			hash="{CRYPT}"
 			dnmode="{DNMODE}"
-			server="{LOCALHOST}"
+			server="{LDAPHOST}"
 			config="ou=gosa,ou=configs,ou=systems,{LDAPBASE}">
 
-			<referral url="{LOCALHOST}"
+			<referral url="{LDAPHOST}/{LDAPBASE}"
 				admin="{LDAPADMIN}"
 				password="{PASSWORD}" />
 		</location>
diff --git a/include/setup_checks.inc b/include/setup_checks.inc
index b5ce6684c..b7640a2ed 100644
--- a/include/setup_checks.inc
+++ b/include/setup_checks.inc
@@ -417,7 +417,7 @@ function parse_contrib_conf()
   $replacements['{LDAPBASE}']               =   $ldapconf['base'];
   $replacements['{LDAPADMIN}']              =   $ldapconf['admin'];
   $replacements['{DNMODE}']                 =   $ldapconf['peopledn'];
-  $replacements['{LOCALHOST}']              =   $ldapconf['uri'];
+  $replacements['{LDAPHOST}']               =   $ldapconf['uri'];
   $replacements['{PASSWORD}']               =   $ldapconf['password'];
   $replacements['{CRYPT}']                  =   $ldapconf['arr_cryptkeys'][$ldapconf['arr_crypts']];
   $replacements['{SID}']                    =   "";