- add and test a "unique" operator

20 files changed, 232 insertions, 0 deletions

diff --git a/tests/test35-nis-nested-groups/after.sh b/tests/test35-nis-nested-groups/after.sh
new file mode 100755
index 0000000..27afbdf
--- /dev/null
+++ b/tests/test35-nis-nested-groups/after.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+echo map list:
+$YP maplist example.com
+$YP -c maplist example.com
+for map in `$YP maplist example.com` ; do
+	echo contents of example.com:"$map":
+	$YP cat example.com $map
+done
diff --git a/tests/test35-nis-nested-groups/after.txt b/tests/test35-nis-nested-groups/after.txt
new file mode 100644
index 0000000..dea7719
--- /dev/null
+++ b/tests/test35-nis-nested-groups/after.txt
@@ -0,0 +1,16 @@
+map list:
+test
+users
+test
+users
+contents of example.com:test:
+group1	user2a,user2a
+group2	group1-fake-uid,user2b,user2a,group1-fake-uid,user2b,user2a
+contents of example.com:users:
+user1	user1:user1
+user1a	user1a:User 1 A
+user1b	user1b:User 1 B
+user1c	user1c:User 1 C
+user2a	user2a:User 2 A
+user2b	user2b:User 2 B
+user2c	user2c:User 2 C
diff --git a/tests/test35-nis-nested-groups/before.sh b/tests/test35-nis-nested-groups/before.sh
new file mode 100755
index 0000000..27afbdf
--- /dev/null
+++ b/tests/test35-nis-nested-groups/before.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+echo map list:
+$YP maplist example.com
+$YP -c maplist example.com
+for map in `$YP maplist example.com` ; do
+	echo contents of example.com:"$map":
+	$YP cat example.com $map
+done
diff --git a/tests/test35-nis-nested-groups/before.txt b/tests/test35-nis-nested-groups/before.txt
new file mode 100644
index 0000000..e9fc0f6
--- /dev/null
+++ b/tests/test35-nis-nested-groups/before.txt
@@ -0,0 +1,16 @@
+map list:
+test
+users
+test
+users
+contents of example.com:test:
+group1	
+group2	group1-fake-uid,group1-fake-uid
+contents of example.com:users:
+user1	user1:user1
+user1a	user1a:User 1 A
+user1b	user1b:User 1 B
+user1c	user1c:User 1 C
+user2a	user2a:User 2 A
+user2b	user2b:User 2 B
+user2c	user2c:User 2 C
diff --git a/tests/test35-nis-nested-groups/change.sh b/tests/test35-nis-nested-groups/change.sh
new file mode 100755
index 0000000..d170da8
--- /dev/null
+++ b/tests/test35-nis-nested-groups/change.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+modify << EOF
+dn: cn=group1, cn=Groups1, cn=Accounts, dc=example, dc=com
+changetype: modify
+add: member
+member: uid=user2a, cn=Users2, cn=Accounts, dc=example, dc=com
+-
+
+dn: cn=group2, cn=Groups1, cn=Accounts, dc=example, dc=com
+changetype: modify
+add: member
+member: uid=user2b, cn=Users2, cn=Accounts, dc=example, dc=com
+-
+
+EOF
diff --git a/tests/test35-nis-nested-groups/change.txt b/tests/test35-nis-nested-groups/change.txt
new file mode 100644
index 0000000..aefc0f1
--- /dev/null
+++ b/tests/test35-nis-nested-groups/change.txt
@@ -0,0 +1,4 @@
+modifying entry "cn=group1, cn=Groups1, cn=Accounts, dc=example, dc=com"
+
+modifying entry "cn=group2, cn=Groups1, cn=Accounts, dc=example, dc=com"
+
diff --git a/tests/test35-nis-nested-groups/description.txt b/tests/test35-nis-nested-groups/description.txt
new file mode 100644
index 0000000..36f7ff5
--- /dev/null
+++ b/tests/test35-nis-nested-groups/description.txt
@@ -0,0 +1 @@
+nested group memberships (group->member) not unique
diff --git a/tests/test35-nis-nested-groups/dse.ldif b/tests/test35-nis-nested-groups/dse.ldif
new file mode 100644
index 0000000..c5a3e3b
--- /dev/null
+++ b/tests/test35-nis-nested-groups/dse.ldif
@@ -0,0 +1,21 @@
+dn: nis-domain=example.com+nis-map=users,cn=NIS Server,cn=plugins,cn=config
+objectClass: top
+objectClass: extensibleObject
+nis-domain: example.com
+nis-map: users
+nis-base: cn=Users1, cn=Accounts, dc=example, dc=com
+nis-base: cn=Users2, cn=Accounts, dc=example, dc=com
+nis-filter: objectclass=posixAccount
+nis-keys-format: %{uid}
+nis-value-format:  %{uid}:%{cn}
+
+dn: nis-domain=example.com+nis-map=test,cn=NIS Server,cn=plugins,cn=config
+objectClass: top
+objectClass: extensibleObject
+nis-domain: example.com
+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(",","%deref_r(\"member\",\"uid\")","%referred_r(\"users\",\"memberOf\",\"uid\")","%deref_r(\"member\",\"uid\")","%referred_r(\"users\",\"memberOf\",\"uid\")")
+
diff --git a/tests/test35-nis-nested-groups/plugin-skip-memberof.txt b/tests/test35-nis-nested-groups/plugin-skip-memberof.txt
new file mode 100644
index 0000000..adbe54f
--- /dev/null
+++ b/tests/test35-nis-nested-groups/plugin-skip-memberof.txt
@@ -0,0 +1 @@
+skip memberof
diff --git a/tests/test35-nis-nested-groups/userRoot.ldif b/tests/test35-nis-nested-groups/userRoot.ldif
new file mode 100644
index 0000000..7aa1110
--- /dev/null
+++ b/tests/test35-nis-nested-groups/userRoot.ldif
@@ -0,0 +1,26 @@
+dn: uid=user1, cn=Users1, cn=Accounts, dc=example, dc=com
+objectClass: posixAccount
+objectClass: inetUser
+cn: user1
+uid: user1
+uidNumber: 1001
+gidNumber: 1001
+gecos: User
+loginShell: /bin/bash
+homeDirectory: /home/user
+
+dn: cn=group1, cn=Groups1, cn=Accounts, dc=example, dc=com
+objectClass: posixgroup
+objectClass: extensibleObject
+cn: group1
+uid: group1-fake-uid
+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
+
diff --git a/tests/test36-nis-nested-groups/after.sh b/tests/test36-nis-nested-groups/after.sh
new file mode 100755
index 0000000..27afbdf
--- /dev/null
+++ b/tests/test36-nis-nested-groups/after.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+echo map list:
+$YP maplist example.com
+$YP -c maplist example.com
+for map in `$YP maplist example.com` ; do
+	echo contents of example.com:"$map":
+	$YP cat example.com $map
+done
diff --git a/tests/test36-nis-nested-groups/after.txt b/tests/test36-nis-nested-groups/after.txt
new file mode 100644
index 0000000..d6a143c
--- /dev/null
+++ b/tests/test36-nis-nested-groups/after.txt
@@ -0,0 +1,16 @@
+map list:
+test
+users
+test
+users
+contents of example.com:test:
+group1	user2a
+group2	group1-fake-uid,user2b,user2a
+contents of example.com:users:
+user1	user1:user1
+user1a	user1a:User 1 A
+user1b	user1b:User 1 B
+user1c	user1c:User 1 C
+user2a	user2a:User 2 A
+user2b	user2b:User 2 B
+user2c	user2c:User 2 C
diff --git a/tests/test36-nis-nested-groups/before.sh b/tests/test36-nis-nested-groups/before.sh
new file mode 100755
index 0000000..27afbdf
--- /dev/null
+++ b/tests/test36-nis-nested-groups/before.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+echo map list:
+$YP maplist example.com
+$YP -c maplist example.com
+for map in `$YP maplist example.com` ; do
+	echo contents of example.com:"$map":
+	$YP cat example.com $map
+done
diff --git a/tests/test36-nis-nested-groups/before.txt b/tests/test36-nis-nested-groups/before.txt
new file mode 100644
index 0000000..1c55f39
--- /dev/null
+++ b/tests/test36-nis-nested-groups/before.txt
@@ -0,0 +1,16 @@
+map list:
+test
+users
+test
+users
+contents of example.com:test:
+group1	
+group2	group1-fake-uid
+contents of example.com:users:
+user1	user1:user1
+user1a	user1a:User 1 A
+user1b	user1b:User 1 B
+user1c	user1c:User 1 C
+user2a	user2a:User 2 A
+user2b	user2b:User 2 B
+user2c	user2c:User 2 C
diff --git a/tests/test36-nis-nested-groups/change.sh b/tests/test36-nis-nested-groups/change.sh
new file mode 100755
index 0000000..d170da8
--- /dev/null
+++ b/tests/test36-nis-nested-groups/change.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+modify << EOF
+dn: cn=group1, cn=Groups1, cn=Accounts, dc=example, dc=com
+changetype: modify
+add: member
+member: uid=user2a, cn=Users2, cn=Accounts, dc=example, dc=com
+-
+
+dn: cn=group2, cn=Groups1, cn=Accounts, dc=example, dc=com
+changetype: modify
+add: member
+member: uid=user2b, cn=Users2, cn=Accounts, dc=example, dc=com
+-
+
+EOF
diff --git a/tests/test36-nis-nested-groups/change.txt b/tests/test36-nis-nested-groups/change.txt
new file mode 100644
index 0000000..aefc0f1
--- /dev/null
+++ b/tests/test36-nis-nested-groups/change.txt
@@ -0,0 +1,4 @@
+modifying entry "cn=group1, cn=Groups1, cn=Accounts, dc=example, dc=com"
+
+modifying entry "cn=group2, cn=Groups1, cn=Accounts, dc=example, dc=com"
+
diff --git a/tests/test36-nis-nested-groups/description.txt b/tests/test36-nis-nested-groups/description.txt
new file mode 100644
index 0000000..93cb64f
--- /dev/null
+++ b/tests/test36-nis-nested-groups/description.txt
@@ -0,0 +1 @@
+nested group memberships (group->member) unique
diff --git a/tests/test36-nis-nested-groups/dse.ldif b/tests/test36-nis-nested-groups/dse.ldif
new file mode 100644
index 0000000..94b27e5
--- /dev/null
+++ b/tests/test36-nis-nested-groups/dse.ldif
@@ -0,0 +1,21 @@
+dn: nis-domain=example.com+nis-map=users,cn=NIS Server,cn=plugins,cn=config
+objectClass: top
+objectClass: extensibleObject
+nis-domain: example.com
+nis-map: users
+nis-base: cn=Users1, cn=Accounts, dc=example, dc=com
+nis-base: cn=Users2, cn=Accounts, dc=example, dc=com
+nis-filter: objectclass=posixAccount
+nis-keys-format: %{uid}
+nis-value-format:  %{uid}:%{cn}
+
+dn: nis-domain=example.com+nis-map=test,cn=NIS Server,cn=plugins,cn=config
+objectClass: top
+objectClass: extensibleObject
+nis-domain: example.com
+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(",","%unique(\"%deref_r(\\\"member\\\",\\\"uid\\\")\",\"%referred_r(\\\"users\\\",\\\"memberOf\\\",\\\"uid\\\")\",\"%deref_r(\\\"member\\\",\\\"uid\\\")\",\"%referred_r(\\\"users\\\",\\\"memberOf\\\",\\\"uid\\\")\")")
+
diff --git a/tests/test36-nis-nested-groups/plugin-skip-memberof.txt b/tests/test36-nis-nested-groups/plugin-skip-memberof.txt
new file mode 100644
index 0000000..adbe54f
--- /dev/null
+++ b/tests/test36-nis-nested-groups/plugin-skip-memberof.txt
@@ -0,0 +1 @@
+skip memberof
diff --git a/tests/test36-nis-nested-groups/userRoot.ldif b/tests/test36-nis-nested-groups/userRoot.ldif
new file mode 100644
index 0000000..7aa1110
--- /dev/null
+++ b/tests/test36-nis-nested-groups/userRoot.ldif
@@ -0,0 +1,26 @@
+dn: uid=user1, cn=Users1, cn=Accounts, dc=example, dc=com
+objectClass: posixAccount
+objectClass: inetUser
+cn: user1
+uid: user1
+uidNumber: 1001
+gidNumber: 1001
+gecos: User
+loginShell: /bin/bash
+homeDirectory: /home/user
+
+dn: cn=group1, cn=Groups1, cn=Accounts, dc=example, dc=com
+objectClass: posixgroup
+objectClass: extensibleObject
+cn: group1
+uid: group1-fake-uid
+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
+