diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:10:14 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:10:14 +1000 |
| commit | 7ef21658fbb519859aa7d23a614e1fdbcae95693 (patch) | |
| tree | d75f21082778eeae37f343b62b62f905274cf3fb /source4/setup | |
| parent | 805dd85291fa55695ee7ae2b8f6d3c168d9186e8 (diff) | |
| download | samba-7ef21658fbb519859aa7d23a614e1fdbcae95693.tar.gz samba-7ef21658fbb519859aa7d23a614e1fdbcae95693.tar.bz2 samba-7ef21658fbb519859aa7d23a614e1fdbcae95693.zip | |
Fix up new OpenLDAP MMR code.
This changes the MMR password from hard-coded value of 'linux',
adds tests and fixes the Fedora DS backend.
Currently the MMR password matches the admin password, but we can
change this to be another random value if required.
Also require the port to be specified on the command line, so we don't
hard-code a port of 9000.
Andrew Bartlett
(This used to be commit 08257c6d6ce809fcd53f9b2b4d558fef616b74ce)
Diffstat (limited to 'source4/setup')
| -rw-r--r-- | source4/setup/mmr_serverids.conf | 3 | ||||
| -rw-r--r-- | source4/setup/mmr_syncrepl.conf | 6 | ||||
| -rw-r--r-- | source4/setup/slapd.conf | 6 | ||||
| -rwxr-xr-x | source4/setup/tests/blackbox_provision-backend.sh | 1 |
4 files changed, 10 insertions, 6 deletions
diff --git a/source4/setup/mmr_serverids.conf b/source4/setup/mmr_serverids.conf index 863508d0d6..c6d14010b4 100644 --- a/source4/setup/mmr_serverids.conf +++ b/source4/setup/mmr_serverids.conf @@ -1 +1,2 @@ -ServerID ${SERVERID} "${LDAPSERVER}:9000" +# Generated from template mmr_serverids.conf +ServerID ${SERVERID} "${LDAPSERVER}" diff --git a/source4/setup/mmr_syncrepl.conf b/source4/setup/mmr_syncrepl.conf index 857f044ccd..5fa8b8f8a0 100644 --- a/source4/setup/mmr_syncrepl.conf +++ b/source4/setup/mmr_syncrepl.conf @@ -1,10 +1,12 @@ +# Generated from template mmr_syncrepl.conf + syncrepl rid=${RID} - provider="${LDAPSERVER}:9000" + provider="${LDAPSERVER}" searchbase="${MMRDN}" type=refreshAndPersist retry="10 +" bindmethod=simple binddn="CN=Manager,${MMRDN}" - credentials="linux" + credentials="${MMR_PASSWORD}" diff --git a/source4/setup/slapd.conf b/source4/setup/slapd.conf index be68ec2588..141c0cd27a 100644 --- a/source4/setup/slapd.conf +++ b/source4/setup/slapd.conf @@ -62,7 +62,7 @@ rootdn cn=Manager,cn=Samba database hdb suffix ${SCHEMADN} rootdn cn=Manager,${SCHEMADN} -rootpw linux +rootpw "${MMR_PASSWORD}" directory ${LDAPDIR}/db/schema index objectClass eq index samAccountName eq @@ -89,7 +89,7 @@ ${MIRRORMODE} database hdb suffix ${CONFIGDN} rootdn cn=Manager,${CONFIGDN} -rootpw linux +rootpw "${MMR_PASSWORD}" directory ${LDAPDIR}/db/config index objectClass eq index samAccountName eq @@ -118,7 +118,7 @@ ${MIRRORMODE} database hdb suffix ${DOMAINDN} rootdn cn=Manager,${DOMAINDN} -rootpw linux +rootpw "${MMR_PASSWORD}" directory ${LDAPDIR}/db/user index objectClass eq index samAccountName eq diff --git a/source4/setup/tests/blackbox_provision-backend.sh b/source4/setup/tests/blackbox_provision-backend.sh index 312ca5c70e..04f22dbf1d 100755 --- a/source4/setup/tests/blackbox_provision-backend.sh +++ b/source4/setup/tests/blackbox_provision-backend.sh @@ -13,6 +13,7 @@ shift 1 . `dirname $0`/../../../testprogs/blackbox/subunit.sh testit "openldap-backend" $PYTHON ./setup/provision-backend --domain=FOO --realm=foo.example.com --host-name=samba --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend +testit "openldap-mmr-backend" $PYTHON ./setup/provision-backend --domain=FOO --realm=foo.example.com --host-name=samba --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-mmr-backend --ol-mmr-urls='ldap://localdc1:9000,ldap://localdc2:9000,ldap://localdc3:9000' testit "fedora-ds-backend" $PYTHON ./setup/provision-backend --domain=FOO --realm=foo.example.com --host-name=samba --ldap-backend-type=fedora-ds --targetdir=$PREFIX/fedora-ds-backend reprovision() { |