Fixed setup to use uidbase

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index f372b4c4d6ab7530a8d6fc8295374433b4eddbfe..6d392760d1e85fba9989e5d8e14239d1858efda5 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -224,7 +224,7 @@
                displayerros="{errorlvl}">
 
                <location name="{LOCATIONNAME}"
-                       uidbase="1000"
+                       uidbase="{UIDBASE}"
                        governmentmode="{GOVERNMENTMODE}"
                        sambaversion="{SAMBAVERSION}"
                        {SID}

diff --git a/include/functions_setup.inc b/include/functions_setup.inc
index d93f5b7138a35888d7980ea9dd529c5e3b61635e..20edcb3a3e577c4d74495bb9cb3894c8e5b864bb 100644 (file)
--- a/include/functions_setup.inc
+++ b/include/functions_setup.inc
@@ -512,11 +512,13 @@ function parse_contrib_conf()
     $pwdhash=('perl -MCrypt::SmbHash -e "ntlmgen \"\$ARGV[0]\", \$lm, \$nt; print \"\${lm}:\${nt}\n\";" $1');
   }
 
+
   /* Define which variables will be replaced */
   $replacements['{LOCATIONNAME}']  = $ldapconf['location'];
   $replacements['{SAMBAVERSION}']  = $used_samba_version;
   $replacements['{LDAPBASE}']      = $ldapconf['base'];
   $replacements['{LDAPADMIN}']     = $ldapconf['admin'];
+  $replacements['{UIDBASE}']       = $ldapconf['uidbase'];
   $replacements['{DNMODE}']        = $ldapconf['peopledn'];
   $replacements['{LDAPHOST}']      = $ldapconf['uri'];
   $replacements['{PASSWORD}']      = $ldapconf['password'];