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 0be337fafb5e72da16798dea42313636bb9b6040..587d856f013e05c83ec9cb363c3be108d788f3c7 100644 (file)
--- 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 b5ce6684c382393420736fc0d559683013fb0ebe..b7640a2ed6d142c12cd0ec4acef7f726b6a7cab7 100644 (file)
--- 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}']                    =   "";