summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-09-08 04:35:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:17:54 -0500
commit8d21ad6c25d1298d3a682077a2080571ccb70030 (patch)
tree57f470d45cb68a0810d83d78a389b2266f9325f9
parentf140bd7e38947847a1bb9a42dbb9c6760e5c3756 (diff)
downloadsamba-8d21ad6c25d1298d3a682077a2080571ccb70030.tar.gz
samba-8d21ad6c25d1298d3a682077a2080571ccb70030.tar.bz2
samba-8d21ad6c25d1298d3a682077a2080571ccb70030.zip
r18246: Let our openldap slapd.conf include the magic to have DIGEST-MD5 on
the server-side work. (This used to be commit 73d87cce7c5e33f73d6a63379af3586f543eb372)
-rwxr-xr-xsource4/script/tests/mktestsetup.sh13
1 files changed, 11 insertions, 2 deletions
diff --git a/source4/script/tests/mktestsetup.sh b/source4/script/tests/mktestsetup.sh
index 1814e960fd..f21d0a2354 100755
--- a/source4/script/tests/mktestsetup.sh
+++ b/source4/script/tests/mktestsetup.sh
@@ -281,10 +281,16 @@ include $LDAPDIR/ad.schema
pidfile $PIDDIR/slapd.pid
argsfile $LDAPDIR/slapd.args
-
+sasl-realm $DNSNAME
access to * by * write
-allow update_anon bind_anon_dn
+authz-regexp
+ uid=([^,]*),cn=$DNSNAME,cn=digest-md5,cn=auth
+ ldap:///$BASEDN??sub?(samAccountName=$1)
+
+authz-regexp
+ uid=([^,]*),cn=([^,]*),cn=digest-md5,cn=auth
+ ldap:///$BASEDN??sub?(samAccountName=$1)
include $LDAPDIR/modules.conf
@@ -293,6 +299,8 @@ defaultsearchbase "$BASEDN"
backend bdb
database bdb
suffix "$BASEDN"
+rootdn "cn=Manager,$BASEDN"
+rootpw $PASSWORD
directory $LDAPDIR/db
index objectClass eq
index samAccountName eq
@@ -302,6 +310,7 @@ EOF
PROVISION_OPTIONS="$CONFIGURATION --host-name=$NETBIOSNAME --host-ip=127.0.0.1"
PROVISION_OPTIONS="$PROVISION_OPTIONS --quiet --domain $DOMAIN --realm $REALM"
PROVISION_OPTIONS="$PROVISION_OPTIONS --adminpass $PASSWORD --root=$ROOT"
+PROVISION_OPTIONS="$PROVISION_OPTIONS --simple-bind-dn=cn=Manager,$BASEDN --password=$PASSWORD --root=$ROOT"
$srcdir/bin/smbscript $srcdir/setup/provision $PROVISION_OPTIONS
LDAPI="ldapi://$LDAPDIR/ldapi"