diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-03-06 06:30:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:49:18 -0500 |
| commit | 6376a474c7c873bfb0f9747d13056567c902635a (patch) | |
| tree | 318afc49f048289c2b97abc6e27db8bb0b07ecff /source4/script/tests/mk-fedora-ds.sh | |
| parent | 3e1dd63927b6d50aa21f32ffaa41b320026be6a1 (diff) | |
| download | samba-6376a474c7c873bfb0f9747d13056567c902635a.tar.gz samba-6376a474c7c873bfb0f9747d13056567c902635a.tar.bz2 samba-6376a474c7c873bfb0f9747d13056567c902635a.zip | |
r21720: Try to make 'TEST_LDAP=yes make test' work again. These recent
changes seem to have been lost in the merge, and some variables were
not yet exported.
Andrew Bartlett
(This used to be commit ee9d9fb6c0bd3d4d01dea771025536ff83057072)
Diffstat (limited to 'source4/script/tests/mk-fedora-ds.sh')
| -rwxr-xr-x | source4/script/tests/mk-fedora-ds.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/script/tests/mk-fedora-ds.sh b/source4/script/tests/mk-fedora-ds.sh index 28b9fe29ab..b198a768db 100755 --- a/source4/script/tests/mk-fedora-ds.sh +++ b/source4/script/tests/mk-fedora-ds.sh @@ -1,9 +1,9 @@ FEDORA_DS_INF=$LDAPDIR/fedorads.inf -export FEDORA_DS_INF FEDORA_DS_INITIAL_LDIF=$LDAPDIR/fedorads-initial.ldif #Make the subdirectory be as fedora DS would expect FEDORA_DS_DIR=$LDAPDIR/slapd-samba4 +echo FEDORA_DS_DIR=$FEDORA_DS_DIR cat >$FEDORA_DS_INF <<EOF [General] @@ -63,7 +63,8 @@ perl $FEDORA_DS_PREFIX/bin/ds_newinst.pl $FEDORA_DS_INF || exit 1; $srcdir/bin/ad2oLschema $CONFIGURATION -H $PRIVATEDIR/sam.ldb --option=convert:target=fedora-ds -I $srcdir/setup/schema-map-fedora-ds-1.0 -O $FEDORA_DS_DIR/schema/99_ad.ldif >&2 -LDAP_URI_ESCAPE=$LDAP_URI; +LDAP_URI_ESCAPE="ldapi://"`echo $LDAPDIR/ldapi | sed 's|/|%2F|g'` + PROVISION_OPTIONS="$PROVISION_OPTIONS --ldap-module=nsuniqueid" #it is easier to base64 encode this than correctly escape it: # (targetattr = "*") (version 3.0;acl "full access to all by all";allow (all)(userdn = "ldap:///anyone");) |