- remove unnecessary searches with scope=base and scope=one

- add a check to be sure we catch users or hosts being added to member groups

6 files changed, 103 insertions, 80 deletions

diff --git a/tests/test15-schema-nested/after.sh b/tests/test15-schema-nested/after.sh
new file mode 100755
index 0000000..8b810ac
--- /dev/null
+++ b/tests/test15-schema-nested/after.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+tmpfile=`mktemp ${TMP:-/tmp}/ldifXXXXXX`
+if test -z "$tmpfile" ; then
+	echo error creating temporary file
+fi
+trap 'rm -f "$tmpfile"' EXIT
+search -b cn=ng,cn=compat,cn=accounts,dc=example,dc=com > $tmpfile
+$LDIFSORT $tmpfile
diff --git a/tests/test15-schema-nested/after.txt b/tests/test15-schema-nested/after.txt
new file mode 100644
index 0000000..f3715ff
--- /dev/null
+++ b/tests/test15-schema-nested/after.txt
@@ -0,0 +1,74 @@
+dn: cn=ng,cn=compat,cn=Accounts,dc=example,dc=com
+objectClass: extensibleObject
+cn: ng
+
+dn: cn=ng1,cn=ng,cn=compat,cn=accounts,dc=example,dc=com
+objectClass: nisNetgroup
+objectClass: top
+memberNisNetgroup: ng2
+nisNetgroupTriple: (myhost.lab.com,steve_sss,oldnis.domain.com)
+nisNetgroupTriple: (myhost.lab.com,gorelock,oldnis.domain.com)
+nisNetgroupTriple: (myhost.lab.com,dev1,oldnis.domain.com)
+nisNetgroupTriple: (myhost.lab.com,dev2,oldnis.domain.com)
+nisNetgroupTriple: (myhost.lab.com,dev3,oldnis.domain.com)
+nisNetgroupTriple: (guest1.vg.com,steve_sss,oldnis.domain.com)
+nisNetgroupTriple: (guest1.vg.com,gorelock,oldnis.domain.com)
+nisNetgroupTriple: (guest1.vg.com,dev1,oldnis.domain.com)
+nisNetgroupTriple: (guest1.vg.com,dev2,oldnis.domain.com)
+nisNetgroupTriple: (guest1.vg.com,dev3,oldnis.domain.com)
+nisNetgroupTriple: (guest2.vg.com,steve_sss,oldnis.domain.com)
+nisNetgroupTriple: (guest2.vg.com,gorelock,oldnis.domain.com)
+nisNetgroupTriple: (guest2.vg.com,dev1,oldnis.domain.com)
+nisNetgroupTriple: (guest2.vg.com,dev2,oldnis.domain.com)
+nisNetgroupTriple: (guest2.vg.com,dev3,oldnis.domain.com)
+nisNetgroupTriple: (guest3.vg.com,steve_sss,oldnis.domain.com)
+nisNetgroupTriple: (guest3.vg.com,gorelock,oldnis.domain.com)
+nisNetgroupTriple: (guest3.vg.com,dev1,oldnis.domain.com)
+nisNetgroupTriple: (guest3.vg.com,dev2,oldnis.domain.com)
+nisNetgroupTriple: (guest3.vg.com,dev3,oldnis.domain.com)
+nisNetgroupTriple: (nvguest1.vg.com,steve_sss,oldnis.domain.com)
+nisNetgroupTriple: (nvguest1.vg.com,gorelock,oldnis.domain.com)
+nisNetgroupTriple: (nvguest1.vg.com,dev1,oldnis.domain.com)
+nisNetgroupTriple: (nvguest1.vg.com,dev2,oldnis.domain.com)
+nisNetgroupTriple: (nvguest1.vg.com,dev3,oldnis.domain.com)
+nisNetgroupTriple: (nvguest2.vg.com,steve_sss,oldnis.domain.com)
+nisNetgroupTriple: (nvguest2.vg.com,gorelock,oldnis.domain.com)
+nisNetgroupTriple: (nvguest2.vg.com,dev1,oldnis.domain.com)
+nisNetgroupTriple: (nvguest2.vg.com,dev2,oldnis.domain.com)
+nisNetgroupTriple: (nvguest2.vg.com,dev3,oldnis.domain.com)
+nisNetgroupTriple: (nvguest3.vg.com,steve_sss,oldnis.domain.com)
+nisNetgroupTriple: (nvguest3.vg.com,gorelock,oldnis.domain.com)
+nisNetgroupTriple: (nvguest3.vg.com,dev1,oldnis.domain.com)
+nisNetgroupTriple: (nvguest3.vg.com,dev2,oldnis.domain.com)
+nisNetgroupTriple: (nvguest3.vg.com,dev3,oldnis.domain.com)
+nisNetgroupTriple: (otherhost.lab.com,steve_sss,oldnis.domain.com)
+nisNetgroupTriple: (otherhost.lab.com,gorelock,oldnis.domain.com)
+nisNetgroupTriple: (otherhost.lab.com,dev1,oldnis.domain.com)
+nisNetgroupTriple: (otherhost.lab.com,dev2,oldnis.domain.com)
+nisNetgroupTriple: (otherhost.lab.com,dev3,oldnis.domain.com)
+cn: ng1
+
+dn: cn=ng2,cn=ng,cn=compat,cn=accounts,dc=example,dc=com
+objectClass: nisNetgroup
+objectClass: top
+nisNetgroupTriple: (foo.lab.domain.com,rcrow,lab.domain.com)
+nisNetgroupTriple: (foo.lab.domain.com,support1,lab.domain.com)
+nisNetgroupTriple: (foo.lab.domain.com,support2,lab.domain.com)
+nisNetgroupTriple: (foo.lab.domain.com,support3,lab.domain.com)
+nisNetgroupTriple: (foo.lab.domain.com,dev1,lab.domain.com)
+nisNetgroupTriple: (foo.lab.domain.com,dev2,lab.domain.com)
+nisNetgroupTriple: (foo.lab.domain.com,dev3,lab.domain.com)
+cn: ng2
+
+dn: cn=ng3,cn=ng,cn=compat,cn=accounts,dc=example,dc=com
+objectClass: nisNetgroup
+objectClass: top
+nisNetgroupTriple: (,rcrow,lab.domain.com)
+nisNetgroupTriple: (,support1,lab.domain.com)
+nisNetgroupTriple: (,support2,lab.domain.com)
+nisNetgroupTriple: (,support3,lab.domain.com)
+nisNetgroupTriple: (,dev1,lab.domain.com)
+nisNetgroupTriple: (,dev2,lab.domain.com)
+nisNetgroupTriple: (,dev3,lab.domain.com)
+cn: ng3
+
diff --git a/tests/test15-schema-nested/before.sh b/tests/test15-schema-nested/before.sh
index 28d2181..8b810ac 100755
--- a/tests/test15-schema-nested/before.sh
+++ b/tests/test15-schema-nested/before.sh
@@ -4,11 +4,5 @@ if test -z "$tmpfile" ; then
 	echo error creating temporary file
 fi
 trap 'rm -f "$tmpfile"' EXIT
-for scope in base one sub ; do
-	echo \[cn=ng,cn=compat,cn=accounts,dc=example,dc=com:${scope}\]
-	search -b cn=ng,cn=compat,cn=accounts,dc=example,dc=com -s $scope > $tmpfile
-	grep -i ^result: $tmpfile
-	grep -i ^matchedDN: $tmpfile
-	$LDIFSORT $tmpfile
-	echo ""
-done
+search -b cn=ng,cn=compat,cn=accounts,dc=example,dc=com > $tmpfile
+$LDIFSORT $tmpfile
diff --git a/tests/test15-schema-nested/before.txt b/tests/test15-schema-nested/before.txt
index 6810bc7..685af47 100644
--- a/tests/test15-schema-nested/before.txt
+++ b/tests/test15-schema-nested/before.txt
@@ -1,74 +1,3 @@
-[cn=ng,cn=compat,cn=accounts,dc=example,dc=com:base]
-result: 0 Success
-dn: cn=ng,cn=compat,cn=Accounts,dc=example,dc=com
-objectClass: extensibleObject
-cn: ng
-
-
-[cn=ng,cn=compat,cn=accounts,dc=example,dc=com:one]
-result: 0 Success
-dn: cn=ng1,cn=ng,cn=compat,cn=accounts,dc=example,dc=com
-objectClass: nisNetgroup
-objectClass: top
-memberNisNetgroup: ng2
-nisNetgroupTriple: (myhost.lab.com,steve_sss,oldnis.domain.com)
-nisNetgroupTriple: (myhost.lab.com,gorelock,oldnis.domain.com)
-nisNetgroupTriple: (myhost.lab.com,dev1,oldnis.domain.com)
-nisNetgroupTriple: (myhost.lab.com,dev2,oldnis.domain.com)
-nisNetgroupTriple: (myhost.lab.com,dev3,oldnis.domain.com)
-nisNetgroupTriple: (guest1.vg.com,steve_sss,oldnis.domain.com)
-nisNetgroupTriple: (guest1.vg.com,gorelock,oldnis.domain.com)
-nisNetgroupTriple: (guest1.vg.com,dev1,oldnis.domain.com)
-nisNetgroupTriple: (guest1.vg.com,dev2,oldnis.domain.com)
-nisNetgroupTriple: (guest1.vg.com,dev3,oldnis.domain.com)
-nisNetgroupTriple: (guest2.vg.com,steve_sss,oldnis.domain.com)
-nisNetgroupTriple: (guest2.vg.com,gorelock,oldnis.domain.com)
-nisNetgroupTriple: (guest2.vg.com,dev1,oldnis.domain.com)
-nisNetgroupTriple: (guest2.vg.com,dev2,oldnis.domain.com)
-nisNetgroupTriple: (guest2.vg.com,dev3,oldnis.domain.com)
-nisNetgroupTriple: (guest3.vg.com,steve_sss,oldnis.domain.com)
-nisNetgroupTriple: (guest3.vg.com,gorelock,oldnis.domain.com)
-nisNetgroupTriple: (guest3.vg.com,dev1,oldnis.domain.com)
-nisNetgroupTriple: (guest3.vg.com,dev2,oldnis.domain.com)
-nisNetgroupTriple: (guest3.vg.com,dev3,oldnis.domain.com)
-nisNetgroupTriple: (nvguest1.vg.com,steve_sss,oldnis.domain.com)
-nisNetgroupTriple: (nvguest1.vg.com,gorelock,oldnis.domain.com)
-nisNetgroupTriple: (nvguest1.vg.com,dev1,oldnis.domain.com)
-nisNetgroupTriple: (nvguest1.vg.com,dev2,oldnis.domain.com)
-nisNetgroupTriple: (nvguest1.vg.com,dev3,oldnis.domain.com)
-nisNetgroupTriple: (nvguest2.vg.com,steve_sss,oldnis.domain.com)
-nisNetgroupTriple: (nvguest2.vg.com,gorelock,oldnis.domain.com)
-nisNetgroupTriple: (nvguest2.vg.com,dev1,oldnis.domain.com)
-nisNetgroupTriple: (nvguest2.vg.com,dev2,oldnis.domain.com)
-nisNetgroupTriple: (nvguest2.vg.com,dev3,oldnis.domain.com)
-nisNetgroupTriple: (nvguest3.vg.com,steve_sss,oldnis.domain.com)
-nisNetgroupTriple: (nvguest3.vg.com,gorelock,oldnis.domain.com)
-nisNetgroupTriple: (nvguest3.vg.com,dev1,oldnis.domain.com)
-nisNetgroupTriple: (nvguest3.vg.com,dev2,oldnis.domain.com)
-nisNetgroupTriple: (nvguest3.vg.com,dev3,oldnis.domain.com)
-cn: ng1
-
-dn: cn=ng2,cn=ng,cn=compat,cn=accounts,dc=example,dc=com
-objectClass: nisNetgroup
-objectClass: top
-nisNetgroupTriple: (foo.lab.domain.com,rcrow,lab.domain.com)
-nisNetgroupTriple: (foo.lab.domain.com,support1,lab.domain.com)
-nisNetgroupTriple: (foo.lab.domain.com,support2,lab.domain.com)
-nisNetgroupTriple: (foo.lab.domain.com,support3,lab.domain.com)
-cn: ng2
-
-dn: cn=ng3,cn=ng,cn=compat,cn=accounts,dc=example,dc=com
-objectClass: nisNetgroup
-objectClass: top
-nisNetgroupTriple: (,rcrow,lab.domain.com)
-nisNetgroupTriple: (,support1,lab.domain.com)
-nisNetgroupTriple: (,support2,lab.domain.com)
-nisNetgroupTriple: (,support3,lab.domain.com)
-cn: ng3
-
-
-[cn=ng,cn=compat,cn=accounts,dc=example,dc=com:sub]
-result: 0 Success
 dn: cn=ng,cn=compat,cn=Accounts,dc=example,dc=com
 objectClass: extensibleObject
 cn: ng
@@ -132,4 +61,3 @@ nisNetgroupTriple: (,support2,lab.domain.com)
 nisNetgroupTriple: (,support3,lab.domain.com)
 cn: ng3
 
-
diff --git a/tests/test15-schema-nested/change.sh b/tests/test15-schema-nested/change.sh
new file mode 100755
index 0000000..a5864b2
--- /dev/null
+++ b/tests/test15-schema-nested/change.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+modify << EOF
+dn: cn=Support,cn=groups,cn=accounts,dc=example,dc=com
+changetype: modify
+add: member
+member: cn=Engineering,cn=groups,cn=accounts,dc=example,dc=com
+-
+
+dn: cn=NestedVirtualGuests,cn=hostgroups,cn=accounts,dc=example,dc=com
+changetype: modify
+add: member
+member: fqdn=otherhost.lab.com,cn=computers,cn=accounts,dc=example,dc=com
+-
+
+EOF
diff --git a/tests/test15-schema-nested/change.txt b/tests/test15-schema-nested/change.txt
new file mode 100644
index 0000000..2ba5d7b
--- /dev/null
+++ b/tests/test15-schema-nested/change.txt
@@ -0,0 +1,4 @@
+modifying entry "cn=Support,cn=groups,cn=accounts,dc=example,dc=com"
+
+modifying entry "cn=NestedVirtualGuests,cn=hostgroups,cn=accounts,dc=example,dc=com"
+