ITS#7366 Update slapo-constraint tests

diff --git a/tests/data/constraint/constraint.out b/tests/data/constraint/constraint.out
index 94c8d35e1ec213aacd7a24c67981a2658e43fc85..f2d21e998e5ae4bee08b713782545b81c062484a 100644 (file)
--- a/tests/data/constraint/constraint.out
+++ b/tests/data/constraint/constraint.out
@@ -23,3 +23,6 @@ FAIL
 FAIL
 FAIL
 FAIL
+FAIL
+FAIL
+FAIL

diff --git a/tests/data/constraint/t_fail_01.ldif b/tests/data/constraint/t_fail_01.ldif
index c797271eaf0c42b505e07e540a05e31dea271821..f90f33c10fae5f0ebc06f8d764b67e1a3a94de52 100644 (file)
--- a/tests/data/constraint/t_fail_01.ldif
+++ b/tests/data/constraint/t_fail_01.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com

diff --git a/tests/data/constraint/t_fail_02.ldif b/tests/data/constraint/t_fail_02.ldif
index e3f32af0964ef2d65aef51717f7b19a13cce1e06..cccbb18b51ca3fa473705cb7963481eb21fab836 100644 (file)
--- a/tests/data/constraint/t_fail_02.ldif
+++ b/tests/data/constraint/t_fail_02.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com

diff --git a/tests/data/constraint/t_fail_03.ldif b/tests/data/constraint/t_fail_03.ldif
index cf6ac23232bf5a1b74f74ce78aaafa44a8b36bf8..41b0d086648ce42686c4e045995f3de32d0a0182 100644 (file)
--- a/tests/data/constraint/t_fail_03.ldif
+++ b/tests/data/constraint/t_fail_03.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com

diff --git a/tests/data/constraint/t_fail_04.ldif b/tests/data/constraint/t_fail_04.ldif
index 8dd10c68aa0c78fb8f6efe68d42cb8c49845cfda..f5e449aa8e689f01e3702569d91f76ebfa012f90 100644 (file)
--- a/tests/data/constraint/t_fail_04.ldif
+++ b/tests/data/constraint/t_fail_04.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com

diff --git a/tests/data/constraint/t_fail_05.ldif b/tests/data/constraint/t_fail_05.ldif
index 9f110824698c2303965e3ac41362eaddfdd5f5cd..f2ed68d7893a4f37f0300fe7c3fcf2611c2e25a5 100644 (file)
--- a/tests/data/constraint/t_fail_05.ldif
+++ b/tests/data/constraint/t_fail_05.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com

diff --git a/tests/data/constraint/t_fail_06.ldif b/tests/data/constraint/t_fail_06.ldif
index 1871c92b0ef9757b37b54a5b345b503c3c65cb20..17bdc2e1c14af9689d6a73965511fa54681f6d67 100644 (file)
--- a/tests/data/constraint/t_fail_06.ldif
+++ b/tests/data/constraint/t_fail_06.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 replace: mail
 mail: a@example.com

diff --git a/tests/data/constraint/t_fail_07.ldif b/tests/data/constraint/t_fail_07.ldif
index 1041f98820253f0b55f37c7572012b891047d16b..a7539dd5de601c137ed3380a3db27d7a1cea45ca 100644 (file)
--- a/tests/data/constraint/t_fail_07.ldif
+++ b/tests/data/constraint/t_fail_07.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 replace: mail
 mail: a@example.com

diff --git a/tests/data/constraint/t_fail_08.ldif b/tests/data/constraint/t_fail_08.ldif
index 4e5b420a55599051293757ddcd8a080c7e9e67fe..f2269ede01dda68240c33d598ee5ffbba54c96b5 100644 (file)
--- a/tests/data/constraint/t_fail_08.ldif
+++ b/tests/data/constraint/t_fail_08.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com

diff --git a/tests/data/constraint/t_fail_09.ldif b/tests/data/constraint/t_fail_09.ldif
index dd8d747c1d39cfbc61526b2b9a6491578626e99c..10e2b9893f567311fa766797894b63db1c43f6ab 100644 (file)
--- a/tests/data/constraint/t_fail_09.ldif
+++ b/tests/data/constraint/t_fail_09.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com

diff --git a/tests/data/constraint/t_fail_10.ldif b/tests/data/constraint/t_fail_10.ldif
index 043380f944fcb58480916e9b96513876dac738fd..812e8662ebfa8a3686b3078ccaa7c8f84225dcf6 100644 (file)
--- a/tests/data/constraint/t_fail_10.ldif
+++ b/tests/data/constraint/t_fail_10.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: example@not-allowed.com

diff --git a/tests/data/constraint/t_fail_11.ldif b/tests/data/constraint/t_fail_11.ldif
index 8bb03fa6a3722b610b112591af8e3028fee54e65..e3e9d4b5cfeece2936066c73782a655d36a130a2 100644 (file)
--- a/tests/data/constraint/t_fail_11.ldif
+++ b/tests/data/constraint/t_fail_11.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 delete: mail
 mail: original@example.com

diff --git a/tests/data/constraint/t_fail_12.ldif b/tests/data/constraint/t_fail_12.ldif
new file mode 100644 (file)
index 0000000..60558ed
--- /dev/null
+++ b/tests/data/constraint/t_fail_12.ldif
@@ -0,0 +1,10 @@
+dn: cn=John Doe,dc=example,dc=com
+changetype: modify
+delete: mail
+mail: original@example.com
+-
+add: mail
+mail: notsooriginal@example.com
+-
+replace: cn
+cn: John Fail

diff --git a/tests/data/constraint/t_fail_13.ldif b/tests/data/constraint/t_fail_13.ldif
new file mode 100644 (file)
index 0000000..855de83
--- /dev/null
+++ b/tests/data/constraint/t_fail_13.ldif
@@ -0,0 +1,4 @@
+dn: cn=John Doe,dc=example,dc=com
+changetype: modify
+replace: givenname
+givenname: Joe

diff --git a/tests/data/constraint/t_fail_14.ldif b/tests/data/constraint/t_fail_14.ldif
new file mode 100644 (file)
index 0000000..5ba5681
--- /dev/null
+++ b/tests/data/constraint/t_fail_14.ldif
@@ -0,0 +1,4 @@
+dn: cn=John Doe,dc=example,dc=com
+changetype: modify
+replace: sn
+sn: Down

diff --git a/tests/data/constraint/t_ok_01.ldif b/tests/data/constraint/t_ok_01.ldif
index 87b6a4290002007a4587833f2248efd8df8de697..3724eb0e087ac925abca1b901c650ec37064e01a 100644 (file)
--- a/tests/data/constraint/t_ok_01.ldif
+++ b/tests/data/constraint/t_ok_01.ldif
@@ -1,3 +1,3 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 delete: mail

diff --git a/tests/data/constraint/t_ok_02.ldif b/tests/data/constraint/t_ok_02.ldif
index a76df6baa38b2fa61146889a62c77bcd08227a91..20526bdb6b7b1232437771faf5e67a42f39c9ff1 100644 (file)
--- a/tests/data/constraint/t_ok_02.ldif
+++ b/tests/data/constraint/t_ok_02.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 replace: mail
 mail: a@example.com

diff --git a/tests/data/constraint/t_ok_03.ldif b/tests/data/constraint/t_ok_03.ldif
index 19242b470b1cbd8db2492385ea9ac4b570940a92..311fa0df218cc7e652b59aaffc84442930b404cd 100644 (file)
--- a/tests/data/constraint/t_ok_03.ldif
+++ b/tests/data/constraint/t_ok_03.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 replace: mail
 mail: a@example.com

diff --git a/tests/data/constraint/t_ok_04.ldif b/tests/data/constraint/t_ok_04.ldif
index 87b6a4290002007a4587833f2248efd8df8de697..3724eb0e087ac925abca1b901c650ec37064e01a 100644 (file)
--- a/tests/data/constraint/t_ok_04.ldif
+++ b/tests/data/constraint/t_ok_04.ldif
@@ -1,3 +1,3 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 delete: mail

diff --git a/tests/data/constraint/t_ok_05.ldif b/tests/data/constraint/t_ok_05.ldif
index 3d260a38ba70316555d8528523a8a0f3bc325e4f..0f24b2abae5a920fa4aaddbadb32253809f420b9 100644 (file)
--- a/tests/data/constraint/t_ok_05.ldif
+++ b/tests/data/constraint/t_ok_05.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: a@example.com

diff --git a/tests/data/constraint/t_ok_06.ldif b/tests/data/constraint/t_ok_06.ldif
index bac6113adfafe09a698adb960a4ee40f0445ba33..dbe8670ee6a125567b03f558e56838da61bf1db4 100644 (file)
--- a/tests/data/constraint/t_ok_06.ldif
+++ b/tests/data/constraint/t_ok_06.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 delete: mail
 -

diff --git a/tests/data/constraint/t_ok_07.ldif b/tests/data/constraint/t_ok_07.ldif
index 870eff845586d704406171b31a507a08da598747..d2293e04de94ca24e37d4d280547a18cad23f99b 100644 (file)
--- a/tests/data/constraint/t_ok_07.ldif
+++ b/tests/data/constraint/t_ok_07.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 delete: mail
 -

diff --git a/tests/data/constraint/t_ok_08.ldif b/tests/data/constraint/t_ok_08.ldif
index 5593b08d0587f027da239699761ca6d61844be07..450b4c0173ffa545cee26db76a3e43c6b96c8cbd 100644 (file)
--- a/tests/data/constraint/t_ok_08.ldif
+++ b/tests/data/constraint/t_ok_08.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com

diff --git a/tests/data/constraint/t_ok_09.ldif b/tests/data/constraint/t_ok_09.ldif
index 75dd710f24dc7e7f13eb07cc0fd57dad3cf72889..b161e1b7d59def71c1f50fd0c89fc049ef06e238 100644 (file)
--- a/tests/data/constraint/t_ok_09.ldif
+++ b/tests/data/constraint/t_ok_09.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 replace: mail
 mail: a@example.com

diff --git a/tests/data/constraint/t_ok_10.ldif b/tests/data/constraint/t_ok_10.ldif
index 841226452635c3948bf86159ccb64db8a6ba7861..7eb72cdc2f9178e9721010449f652278f7c1616d 100644 (file)
--- a/tests/data/constraint/t_ok_10.ldif
+++ b/tests/data/constraint/t_ok_10.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com

diff --git a/tests/data/constraint/t_ok_11.ldif b/tests/data/constraint/t_ok_11.ldif
index a5a5783eb074a1c466dc387fc27f60e8dfcfb788..04766bf3a4cd7d911628b17aa8c0fd867c5d6d63 100644 (file)
--- a/tests/data/constraint/t_ok_11.ldif
+++ b/tests/data/constraint/t_ok_11.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com

diff --git a/tests/data/constraint/t_ok_12.ldif b/tests/data/constraint/t_ok_12.ldif
index e683bb32631741c00264295d9de1a4802b5b92cc..1cfab0a968e40210d1fdba1ede55fc6fd9fcf649 100644 (file)
--- a/tests/data/constraint/t_ok_12.ldif
+++ b/tests/data/constraint/t_ok_12.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com

diff --git a/tests/data/constraint/t_ok_13.ldif b/tests/data/constraint/t_ok_13.ldif
index 19ccbb87352d8908b52ce6eda05c213fd1604420..acd5771d339afe890f75a31bb24d6977d4a2b0dd 100644 (file)
--- a/tests/data/constraint/t_ok_13.ldif
+++ b/tests/data/constraint/t_ok_13.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 add: mail
 mail: b@example.com

diff --git a/tests/data/constraint/t_ok_14.ldif b/tests/data/constraint/t_ok_14.ldif
index dd00fccdb212244019ed932f419c16644934e2a3..127e463b5b24f3f716ffbb11dd43c35edaf4fe6c 100644 (file)
--- a/tests/data/constraint/t_ok_14.ldif
+++ b/tests/data/constraint/t_ok_14.ldif
@@ -1,4 +1,4 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 changetype: modify
 delete: description
 description: desc1

diff --git a/tests/data/constraint/user.ldif b/tests/data/constraint/user.ldif
index b8a06de99e78f61f81b28ebbfed6aa04715459a5..cc244534b3a0ecab1e735e247ec7acb0b668b5f4 100644 (file)
--- a/tests/data/constraint/user.ldif
+++ b/tests/data/constraint/user.ldif
@@ -1,7 +1,8 @@
-dn: cn=user,dc=example,dc=com
+dn: cn=John Doe,dc=example,dc=com
 objectclass: inetOrgPerson
 objectclass: organizationalPerson
-cn: John
+cn: John Doe
+givenname: John
 sn: Doe
 mail: original@example.com
 description: desc1

diff --git a/tests/scripts/test064-constraint b/tests/scripts/test064-constraint
index 2d29baf1c612d726610236322ffd17e4810a28ff..a3104e168feb6c7bf7ece808a71bcf8b8bb7953c 100755 (executable)
--- a/tests/scripts/test064-constraint
+++ b/tests/scripts/test064-constraint
@@ -13,7 +13,7 @@ ROOTLDIF="$CONSTRAINTDIR/root.ldif"
 USERLDIF="$CONSTRAINTDIR/user.ldif"
 RESULTOUT="$CONSTRAINTDIR/constraint.out"
 SCRIPTOUT="$TESTDIR/constraint.out"
-USERDN="cn=user,$BASEDN"
+USERDN="cn=John Doe,$BASEDN"
 
 CONFDIR=$TESTDIR/slapd.d
 mkdir -p $TESTDIR $CONFDIR $DBDIR1
@@ -91,6 +91,10 @@ olcOverlay: constraint
 olcConstraintAttribute: mail count 3
 olcConstraintAttribute: mail regex ^[[:alnum:]]+@example.com$
 olcConstraintAttribute: description count 2
+# cn value has to be concatenated givenName SP sn
+olcConstraintAttribute: cn,sn,givenName
+  set "(this/givenName + [ ] + this/sn) & this/cn"
+  restrict="ldap:///$USERDN??sub?(objectClass=inetOrgPerson)"
 EOF
 
 $SLAPADD -F $CONFDIR -n 0 -l $TESTDIR/config.ldif
@@ -123,7 +127,7 @@ fi
 echo "Running constraint tests..."
 for ldif in $SRCDIR/data/constraint/{*ok*,*fail*}.ldif; do
        ### reload
-       $LDAPDELETE -D "$MANAGERDN" -H $URI1 -w $PASSWD $USERDN &>/dev/null
+       $LDAPDELETE -D "$MANAGERDN" -H $URI1 -w $PASSWD "$USERDN" &>/dev/null
        RC=$?
        if test $RC != 0 ; then
                echo "ldapdelete failed ($RC)!"