Author: abartlet Date: 2007-07-05 01:45:37 +0000 (Thu, 05 Jul 2007) New Revision: 23716
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23716 Log: Clarify LDAP Manager DN and fix slapd startup syntax. Andrew Bartlett Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js branches/SAMBA_4_0/source/setup/fedorads.inf branches/SAMBA_4_0/source/setup/provision-backend branches/SAMBA_4_0/source/setup/slapd.conf Changeset: Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js =================================================================== --- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-07-05 00:34:11 UTC (rev 23715) +++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-07-05 01:45:37 UTC (rev 23716) @@ -464,6 +464,8 @@ var ldap_path_list = split("/", paths.ldapdir); subobj.LDAPI_URI = "ldapi://" + join("%2F", ldap_path_list) + "%2Fldapi"; + subobj.LDAP_MANAGERDN = "cn=Manager," + subobj.DOMAINDN; + return true; } @@ -852,7 +854,7 @@ subobj.KRBTGTPASS = randpass(12); subobj.MACHINEPASS = randpass(12); subobj.ADMINPASS = randpass(12); - subobj.LDAPMANAGERPASS = randpass(12); + subobj.LDAP_MANAGERPASS = randpass(12); subobj.DEFAULTSITE = "Default-First-Site-Name"; subobj.NEWGUID = randguid; subobj.NTTIME = nttime; Modified: branches/SAMBA_4_0/source/setup/fedorads.inf =================================================================== --- branches/SAMBA_4_0/source/setup/fedorads.inf 2007-07-05 00:34:11 UTC (rev 23715) +++ branches/SAMBA_4_0/source/setup/fedorads.inf 2007-07-05 01:45:37 UTC (rev 23716) @@ -6,8 +6,8 @@ [slapd] ldapifilepath=${LDAPDIR}/ldapi Suffix= ${DOMAINDN} -RootDN= cn=Manager,${DOMAINDN} -RootDNPwd= ${LDAPMANAGERPASS} +RootDN= ${LDAP_MANAGERDN} +RootDNPwd= ${LDAP_MANAGERPASS} ServerIdentifier= samba4 ${SERVERPORT} Modified: branches/SAMBA_4_0/source/setup/provision-backend =================================================================== --- branches/SAMBA_4_0/source/setup/provision-backend 2007-07-05 00:34:11 UTC (rev 23715) +++ branches/SAMBA_4_0/source/setup/provision-backend 2007-07-05 01:45:37 UTC (rev 23716) @@ -90,7 +90,7 @@ 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 LDAP Manager password: %s\n", subobj.LDAPMANAGERPASS); +message("Using %s password: %s\n", subobj.LDAP_MANAGERDN, subobj.LDAP_MANAGERPASS); var tmp_schema_ldb = subobj.LDAPDIR + "/schema-tmp.ldb"; sys.mkdir(subobj.LDAPDIR, 0700); @@ -137,7 +137,7 @@ setup_file("DB_CONFIG", message, subobj.LDAPDBDIR + "/DB_CONFIG", subobj); if (options["ldap-backend-port"] != undefined) { message("\nStart slapd with: \n"); - slapd_command = "slapd -f " + subobj.LDAPDIR + "/slapd.conf -h ldap://0.0.0.0:"; + options["ldap-backend-port"] + " -h " + subobj.LDAPI_URI; + slapd_command = "slapd -f " + subobj.LDAPDIR + "/slapd.conf -h \"ldap://0.0.0.0:"; + options["ldap-backend-port"] + " " + subobj.LDAPI_URI "\""; } else { slapd_command = "slapd -f " + subobj.LDAPDIR + "/slapd.conf -h " + subobj.LDAPI_URI; } Modified: branches/SAMBA_4_0/source/setup/slapd.conf =================================================================== --- branches/SAMBA_4_0/source/setup/slapd.conf 2007-07-05 00:34:11 UTC (rev 23715) +++ branches/SAMBA_4_0/source/setup/slapd.conf 2007-07-05 01:45:37 UTC (rev 23716) @@ -47,8 +47,8 @@ database bdb suffix ${DOMAINDN} -rootdn cn=Manager,${DOMAINDN} -rootpw ${LDAPMANAGERPASS} +rootdn ${LDAP_MANAGERDN} +rootpw ${LDAP_MANAGERPASS} directory ${LDAPDIR}/db/user index objectClass eq index samAccountName eq
