svn commit: samba r19737 - in branches/SAMBA_4_0/source/torture/ldap: .

[metze at samba.org]

Author: metze
Date: 2006-11-16 10:48:51 +0000 (Thu, 16 Nov 2006)
New Revision: 19737

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19737

Log:
- add some more CLDAP rootdse tests
- don't ignore CLDAP rootdse errors anymore

metze
Modified:
   branches/SAMBA_4_0/source/torture/ldap/cldap.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/ldap/cldap.c
===================================================================
--- branches/SAMBA_4_0/source/torture/ldap/cldap.c	2006-11-16 10:47:15 UTC (rev 19736)
+++ branches/SAMBA_4_0/source/torture/ldap/cldap.c	2006-11-16 10:48:51 UTC (rev 19737)
@@ -210,7 +210,9 @@
 	NTSTATUS status;
 	struct cldap_search search;
 	BOOL ret = True;
-	const char *attrs[] = { "currentTime", "highestCommittedUSN", NULL };
+	const char *attrs1[] = { "currentTime", "highestCommittedUSN", NULL };
+	const char *attrs2[] = { "currentTime", "highestCommittedUSN", "netlogon", NULL };
+	const char *attrs3[] = { "netlogon", NULL };
 
 	ZERO_STRUCT(search);
 	search.in.dest_address = dest;
@@ -231,23 +233,40 @@
 
 	printf("fetching currentTime and USN\n");
 	search.in.filter = "(objectclass=*)";
-	search.in.attributes = attrs;
+	search.in.attributes = attrs1;
 
 	status = cldap_search(cldap, mem_ctx, &search);
 	CHECK_STATUS(status, NT_STATUS_OK);
 	
 	if (DEBUGLVL(3)) cldap_dump_results(&search);
 
+	printf("Testing currentTime, USN and netlogon\n");
+	search.in.filter = "(objectclass=*)";
+	search.in.attributes = attrs2;
+
+	status = cldap_search(cldap, mem_ctx, &search);
+	CHECK_STATUS(status, NT_STATUS_OK);
+
+	if (DEBUGLVL(3)) cldap_dump_results(&search);
+
+	printf("Testing objectClass=* and netlogon\n");
+	search.in.filter = "(objectclass2=*)";
+	search.in.attributes = attrs2;
+
+	status = cldap_search(cldap, mem_ctx, &search);
+	CHECK_STATUS(status, NT_STATUS_OK);
+
+	if (DEBUGLVL(3)) cldap_dump_results(&search);
+
 	printf("Testing a false expression\n");
 	search.in.filter = "(&(objectclass=*)(highestCommittedUSN=2))";
-	search.in.attributes = attrs;
+	search.in.attributes = attrs1;
 
 	status = cldap_search(cldap, mem_ctx, &search);
 	CHECK_STATUS(status, NT_STATUS_OK);
-	
-	if (DEBUGLVL(3)) cldap_dump_results(&search);
-	
 
+	if (DEBUGLVL(3)) cldap_dump_results(&search);	
+
 done:
 	return ret;	
 }
@@ -261,10 +280,8 @@
 	mem_ctx = talloc_init("torture_cldap");
 
 	ret &= test_cldap_netlogon(mem_ctx, host);
+	ret &= test_cldap_generic(mem_ctx, host);
 
-	/* at the moment don't consider this failing to be a failure */
-	test_cldap_generic(mem_ctx, host);
-
 	talloc_free(mem_ctx);
 
 	return ret;