- replace one nested group test with another

13 files changed, 16 insertions, 14 deletions

diff --git a/tests/test26-nis-modify-entry/change.txt b/tests/test26-nis-modify-entry/change.txt
deleted file mode 100644
index d37ee64..0000000
--- a/tests/test26-nis-modify-entry/change.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-modifying entry "uid=user1, cn=Users1, cn=Accounts, dc=example, dc=com"
-
-modifying entry "uid=user2c, cn=Users2, cn=Accounts, dc=example, dc=com"
-
diff --git a/tests/test26-nis-modify-entry/description.txt b/tests/test26-nis-modify-entry/description.txt
deleted file mode 100644
index 86b6546..0000000
--- a/tests/test26-nis-modify-entry/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-addition of value to multi-valued attribute
diff --git a/tests/test26-nis-modify-entry/after.sh b/tests/test26-nis-nested-groups/after.sh
index 27afbdf..27afbdf 100755
--- a/tests/test26-nis-modify-entry/after.sh
+++ b/tests/test26-nis-nested-groups/after.sh
diff --git a/tests/test26-nis-modify-entry/after.txt b/tests/test26-nis-nested-groups/after.txt
index 7b09a4e..d6a143c 100644
--- a/tests/test26-nis-modify-entry/after.txt
+++ b/tests/test26-nis-nested-groups/after.txt
@@ -4,8 +4,8 @@ users
 test
 users
 contents of example.com:test:
-group1	user1
-group2	user2c,user1
+group1	user2a
+group2	group1-fake-uid,user2b,user2a
 contents of example.com:users:
 user1	user1:user1
 user1a	user1a:User 1 A
diff --git a/tests/test26-nis-modify-entry/before.sh b/tests/test26-nis-nested-groups/before.sh
index 27afbdf..27afbdf 100755
--- a/tests/test26-nis-modify-entry/before.sh
+++ b/tests/test26-nis-nested-groups/before.sh
diff --git a/tests/test26-nis-modify-entry/before.txt b/tests/test26-nis-nested-groups/before.txt
index 5d7ae38..1c55f39 100644
--- a/tests/test26-nis-modify-entry/before.txt
+++ b/tests/test26-nis-nested-groups/before.txt
@@ -5,7 +5,7 @@ test
 users
 contents of example.com:test:
 group1	
-group2	
+group2	group1-fake-uid
 contents of example.com:users:
 user1	user1:user1
 user1a	user1a:User 1 A
diff --git a/tests/test26-nis-modify-entry/change.sh b/tests/test26-nis-nested-groups/change.sh
index 174c830..2c677f9 100755
--- a/tests/test26-nis-modify-entry/change.sh
+++ b/tests/test26-nis-nested-groups/change.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 modify << EOF
-dn: uid=user1, cn=Users1, cn=Accounts, dc=example, dc=com
+dn: uid=user2a, cn=Users2, cn=Accounts, dc=example, dc=com
 changetype: modify
 add: memberOf
 memberOf: cn=group1, cn=Groups1, cn=Accounts, dc=example, dc=com
 -
 
-dn: uid=user2c, cn=Users2, cn=Accounts, dc=example, dc=com
+dn:  uid=user2b, cn=Users2, cn=Accounts, dc=example, dc=com
 changetype: modify
 add: memberOf
 memberOf: cn=group2, cn=Groups1, cn=Accounts, dc=example, dc=com
diff --git a/tests/test26-nis-nested-groups/change.txt b/tests/test26-nis-nested-groups/change.txt
new file mode 100644
index 0000000..ba31067
--- /dev/null
+++ b/tests/test26-nis-nested-groups/change.txt
@@ -0,0 +1,4 @@
+modifying entry "uid=user2a, cn=Users2, cn=Accounts, dc=example, dc=com"
+
+modifying entry "uid=user2b, cn=Users2, cn=Accounts, dc=example, dc=com"
+
diff --git a/tests/test26-nis-nested-groups/description.txt b/tests/test26-nis-nested-groups/description.txt
new file mode 100644
index 0000000..cab3497
--- /dev/null
+++ b/tests/test26-nis-nested-groups/description.txt
@@ -0,0 +1 @@
+nested group memberships (member->group)
diff --git a/tests/test26-nis-modify-entry/dse.ldif b/tests/test26-nis-nested-groups/dse.ldif
index 8236737..30f87a2 100644
--- a/tests/test26-nis-modify-entry/dse.ldif
+++ b/tests/test26-nis-nested-groups/dse.ldif
@@ -17,5 +17,5 @@ nis-map: test
 nis-base: cn=Groups1, cn=Accounts, dc=example, dc=com
 nis-filter: objectclass=posixgroup
 nis-keys-format: %{cn}
-nis-value-format: %merge(",","%referred_r(\"users\",\"memberOf\",\"uid\")")
+nis-value-format: %merge(",","%deref_r(\"member\",\"uid\")","%referred_r(\"users\",\"memberOf\",\"uid\")")
 
diff --git a/tests/test26-nis-modify-entry/userRoot.ldif b/tests/test26-nis-nested-groups/userRoot.ldif
index 3c5ec36..c44cf92 100644
--- a/tests/test26-nis-modify-entry/userRoot.ldif
+++ b/tests/test26-nis-nested-groups/userRoot.ldif
@@ -13,13 +13,14 @@ dn: cn=group1, cn=Groups1, cn=Accounts, dc=example, dc=com
 objectClass: posixgroup
 objectClass: extensibleObject
 cn: group1
-uid: group1
+uid: group1-fake-uid
 gidNumber: 1002
 memberOf: cn=group2, cn=Groups1, cn=Accounts, dc=example, dc=com
 
 dn: cn=group2, cn=Groups1, cn=Accounts, dc=example, dc=com
 objectClass: posixgroup
 objectClass: extensibleObject
-uid: group2
+cn: group2
+uid: group2-fake-uid
 gidNumber: 1003
 
diff --git a/tests/test27-nis-nested-groups/description.txt b/tests/test27-nis-nested-groups/description.txt
index 4c49b92..f11c001 100644
--- a/tests/test27-nis-nested-groups/description.txt
+++ b/tests/test27-nis-nested-groups/description.txt
@@ -1 +1 @@
-nested group memberships (group->user)
+nested group memberships (group->member)
diff --git a/tests/test27-nis-nested-groups/userRoot.ldif b/tests/test27-nis-nested-groups/userRoot.ldif
index 751718f..7aa1110 100644
--- a/tests/test27-nis-nested-groups/userRoot.ldif
+++ b/tests/test27-nis-nested-groups/userRoot.ldif
@@ -19,6 +19,7 @@ gidNumber: 1002
 dn: cn=group2, cn=Groups1, cn=Accounts, dc=example, dc=com
 objectClass: posixgroup
 objectClass: extensibleObject
+cn: group2
 uid: group2-fake-uid
 gidNumber: 1003
 member: cn=group1, cn=Groups1, cn=Accounts, dc=example, dc=com