r23717: We need to remove the _ in LDAP_MANAGERPASS for the

--ldap-manager-pass= option to work.

Andrew Bartlett
(This used to be commit fbcb1ec14125a4ca57922ec75b01af9a99dcd954)

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 4317a37a54e08c6cd58ee2b8a96a6e5066a9d96e..323c7cdacbaef57bdf3ca9bc4c20d9be595dc60c 100644 (file)
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -464,7 +464,7 @@ function provision_fix_subobj(subobj, paths)
        var ldap_path_list = split("/", paths.ldapdir);
        subobj.LDAPI_URI = "ldapi://" + join("%2F", ldap_path_list) + "%2Fldapi";
 
-       subobj.LDAP_MANAGERDN = "cn=Manager," + subobj.DOMAINDN;
+       subobj.LDAPMANAGERDN = "cn=Manager," + subobj.DOMAINDN;
 
        return true;
 }
@@ -854,7 +854,7 @@ function provision_guess()
        subobj.KRBTGTPASS   = randpass(12);
        subobj.MACHINEPASS  = randpass(12);
        subobj.ADMINPASS    = randpass(12);
-       subobj.LDAP_MANAGERPASS     = randpass(12);
+       subobj.LDAPMANAGERPASS     = randpass(12);
        subobj.DEFAULTSITE  = "Default-First-Site-Name";
        subobj.NEWGUID      = randguid;
        subobj.NTTIME       = nttime;

diff --git a/source4/setup/fedorads.inf b/source4/setup/fedorads.inf
index 43d02da20625d90fdd7b83f770ca67fa6639322e..8aed0338fb422286ab73a94ed2e1931b2a170de0 100644 (file)
--- a/source4/setup/fedorads.inf
+++ b/source4/setup/fedorads.inf
@@ -6,8 +6,8 @@ ServerRoot=   ${LDAPDIR}
 [slapd]
 ldapifilepath=${LDAPDIR}/ldapi
 Suffix= ${DOMAINDN}
-RootDN= ${LDAP_MANAGERDN}
-RootDNPwd= ${LDAP_MANAGERPASS}
+RootDN= ${LDAPMANAGERDN}
+RootDNPwd= ${LDAPMANAGERPASS}
 ServerIdentifier= samba4
 ${SERVERPORT}
 

diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend
index 5a3018b724dc988bfc3ee89f15a230fc902edfd6..208869c930c5e417794f8d180bbc6328921dc919 100755 (executable)
--- a/source4/setup/provision-backend
+++ b/source4/setup/provision-backend
@@ -90,7 +90,7 @@ for (r in options) {
 var paths = provision_default_paths(subobj);
 provision_fix_subobj(subobj, paths);
 message("Provisioning LDAP backend for %s in realm %s into %s\n", subobj.HOSTNAME, subobj.REALM, subobj.LDAPDIR);
-message("Using %s password: %s\n", subobj.LDAP_MANAGERDN, subobj.LDAP_MANAGERPASS);
+message("Using %s password: %s\n", subobj.LDAPMANAGERDN, subobj.LDAPMANAGERPASS);
 var tmp_schema_ldb = subobj.LDAPDIR + "/schema-tmp.ldb";
 sys.mkdir(subobj.LDAPDIR, 0700);
 

diff --git a/source4/setup/slapd.conf b/source4/setup/slapd.conf
index b39e3d5cfbcdaa06c10fde8c022af6609cd364f8..34896d04b93b56bc3d772c0d8ec81f0d877c8a40 100644 (file)
--- a/source4/setup/slapd.conf
+++ b/source4/setup/slapd.conf
@@ -47,8 +47,8 @@ index nETBIOSName eq pres
 
 database        bdb
 suffix         ${DOMAINDN}
-rootdn          ${LDAP_MANAGERDN}
-rootpw          ${LDAP_MANAGERPASS}
+rootdn          ${LDAPMANAGERDN}
+rootpw          ${LDAPMANAGERPASS}
 directory      ${LDAPDIR}/db/user
 index           objectClass eq
 index           samAccountName eq