[SCM] Samba Shared Repository - branch master updated - a25fac13ebd6ffc1e5eac25182636cfa298435f4

[Stefan Metzmacher]

The branch, master has been updated
       via  a25fac13ebd6ffc1e5eac25182636cfa298435f4 (commit)
       via  05994005a35b940efc9cd8d1b3b0eebf2d2e38d7 (commit)
      from  f0c17496366547f14638763a6b8859c365f18792 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a25fac13ebd6ffc1e5eac25182636cfa298435f4
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Oct 2 18:49:11 2008 +0200

    s4:blackblox/test_ldb: test searches via wellknownObjects
    
    metze

commit 05994005a35b940efc9cd8d1b3b0eebf2d2e38d7
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Oct 2 11:56:12 2008 +0200

    s4:setup: add wellknownObjects to the domain object
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source4/setup/provision_basedn_modify.ldif |    8 ++++
 testprogs/blackbox/test_ldb.sh             |   62 ++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/setup/provision_basedn_modify.ldif b/source4/setup/provision_basedn_modify.ldif
index 63332e9..a7b501e 100644
--- a/source4/setup/provision_basedn_modify.ldif
+++ b/source4/setup/provision_basedn_modify.ldif
@@ -77,4 +77,12 @@ subRefs: ${SCHEMADN}
 replace: gPLink
 gPLink: [LDAP://CN={${POLICYGUID}},CN=Policies,CN=System,${DOMAINDN};0]
 -
+replace: wellKnownObjects
+wellKnownObjects: B:32:22b70c67d56e4efb91e9300fca3dc1aa:CN=ForeignSecurityPrincipals,${DOMAINDN}
+wellKnownObjects: B:32:2fbac1870ade11d297c400c04fd8d5cd:CN=Infrastructure,${DOMAINDN}
+wellKnownObjects: B:32:ab1d30f3768811d1aded00c04fd8d5cd:CN=System,${DOMAINDN}
+wellKnownObjects: B:32:a361b2ffffd211d1aa4b00c04fd7d83a:OU=Domain Controllers,${DOMAINDN}
+wellKnownObjects: B:32:aa312825768811d1aded00c04fd8d5cd:CN=Computers,${DOMAINDN}
+wellKnownObjects: B:32:a9d1ca15768811d1aded00c04fd8d5cd:CN=Users,${DOMAINDN}
+-
 ${DOMAINGUID_MOD}
diff --git a/testprogs/blackbox/test_ldb.sh b/testprogs/blackbox/test_ldb.sh
index 8e1af99..7a657d2 100755
--- a/testprogs/blackbox/test_ldb.sh
+++ b/testprogs/blackbox/test_ldb.sh
@@ -117,5 +117,67 @@ echo "Search Options Control Query test returned 0 items"
 failed=`expr $failed + 1`
 fi
 
+function wellkown_object_test() {
+	local guid=$1
+	local object=$2
+	local basedns
+	local dn
+	local r
+	local c
+	local n
+	local failed=0
+
+	basedns="<WKGUID=${guid},${BASEDN}> <wkGuId=${guid},${BASEDN}>"
+	for dn in ${basedns}; do
+		echo "Test ${dn} => ${object}"
+		r=`bin/ldbsearch $options $CONFIGURATION -H $p://$SERVER '(objectClass=*)' -b "${dn}" | grep 'dn: '`
+		n=`echo "${r}" | grep 'dn: ' | wc -l`
+		c=`echo "${r}" | grep "${object}" | wc -l`
+
+		if [ $n -lt 1 ]; then
+			echo "Object not found by WKGUID"
+			failed=`expr $failed + 1`
+			continue
+		fi
+		if [ $c -lt 1 ]; then
+			echo "Wrong object found by WKGUID: [${r}]"
+			failed=`expr $failed + 1`
+			continue
+		fi
+	done
+
+	return $failed
+}
+
+wellkown_object_test 22B70C67D56E4EFB91E9300FCA3DC1AA ForeignSecurityPrincipals
+st=$?
+if [ x"$st" != x"0" ]; then
+	failed=`expr $failed + $st`
+fi
+wellkown_object_test 2FBAC1870ADE11D297C400C04FD8D5CD Infrastructure
+st=$?
+if [ x"$st" != x"0" ]; then
+	failed=`expr $failed + $st`
+fi
+wellkown_object_test AB1D30F3768811D1ADED00C04FD8D5CD System
+st=$?
+if [ x"$st" != x"0" ]; then
+	failed=`expr $failed + $st`
+fi
+wellkown_object_test A361B2FFFFD211D1AA4B00C04FD7D83A Domain Controllers
+st=$?
+if [ x"$st" != x"0" ]; then
+	failed=`expr $failed + $st`
+fi
+wellkown_object_test AA312825768811D1ADED00C04FD8D5CD Computers
+st=$?
+if [ x"$st" != x"0" ]; then
+	failed=`expr $failed + $st`
+fi
+wellkown_object_test A9D1CA15768811D1ADED00C04FD8D5CD Users
+st=$?
+if [ x"$st" != x"0" ]; then
+	failed=`expr $failed + $st`
+fi
 
 exit $failed


-- 
Samba Shared Repository