summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-07-05 02:52:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:59:07 -0500
commit90b49dc5208a083922c75595749d9abd4ef5b652 (patch)
treeb718d1374222e5f7c1d88accb5cac880598a3fca
parent97172e11204b2863ab1e4021aea3c40668d33aef (diff)
downloadsamba-90b49dc5208a083922c75595749d9abd4ef5b652.tar.gz
samba-90b49dc5208a083922c75595749d9abd4ef5b652.tar.bz2
samba-90b49dc5208a083922c75595749d9abd4ef5b652.zip
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)
-rw-r--r--source4/scripting/libjs/provision.js4
-rw-r--r--source4/setup/fedorads.inf4
-rwxr-xr-xsource4/setup/provision-backend2
-rw-r--r--source4/setup/slapd.conf4
4 files changed, 7 insertions, 7 deletions
diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 4317a37a54..323c7cdacb 100644
--- 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 43d02da206..8aed0338fb 100644
--- 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 5a3018b724..208869c930 100755
--- 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 b39e3d5cfb..34896d04b9 100644
--- 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