svn commit: samba r20305 - in
branches/SAMBA_4_0/source/torture/ldap: .
metze at samba.org
metze at samba.org
Thu Dec 21 20:00:55 GMT 2006
Author: metze
Date: 2006-12-21 20:00:55 +0000 (Thu, 21 Dec 2006)
New Revision: 20305
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20305
Log:
as the oid mapping table is dynnamic it makes no sense
to test the mappings when we got the schema via LDAP
as we don't get the mappings
metze
Modified:
branches/SAMBA_4_0/source/torture/ldap/schema.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/ldap/schema.c
===================================================================
--- branches/SAMBA_4_0/source/torture/ldap/schema.c 2006-12-21 13:31:23 UTC (rev 20304)
+++ branches/SAMBA_4_0/source/torture/ldap/schema.c 2006-12-21 20:00:55 UTC (rev 20305)
@@ -351,123 +351,6 @@
return True;
}
-
-static BOOL test_dsdb_map(struct torture_context *torture)
-{
- BOOL ret = true;
- WERROR status;
- const char *oid;
- uint32_t id;
-
- oid = "1.2.840.113556.1.4.1716";
- status = dsdb_map_oid2int(oid, &id);
- if (!W_ERROR_IS_OK(status)) {
- DEBUG(0,("%s => %s\n", oid, win_errstr(status)));
- ret = False;
- } else {
- DEBUG(0,("%s => 0x%08X\n", oid, id));
- }
-
- status = dsdb_map_int2oid(id, torture, &oid);
- if (!W_ERROR_IS_OK(status)) {
- DEBUG(0,("0x%08X => %s\n", id, win_errstr(status)));
- ret = False;
- } else {
- DEBUG(0,("0x%08X => %s\n", id, oid));
- }
-
- oid = "1.2.840.113556.1.4.65535";
- status = dsdb_map_oid2int(oid, &id);
- if (!W_ERROR_IS_OK(status)) {
- DEBUG(0,("%s => %s\n", oid, win_errstr(status)));
- ret = False;
- } else {
- DEBUG(0,("%s => 0x%08X\n", oid, id));
- }
-
- status = dsdb_map_int2oid(id, torture, &oid);
- if (!W_ERROR_IS_OK(status)) {
- DEBUG(0,("0x%08X => %s\n", id, win_errstr(status)));
- ret = False;
- } else {
- DEBUG(0,("0x%08X => %s\n", id, oid));
- }
-
- oid = "1.2.840.113556.1.5.7000";
- status = dsdb_map_oid2int(oid, &id);
- if (!W_ERROR_IS_OK(status)) {
- DEBUG(0,("%s => %s\n", oid, win_errstr(status)));
- ret = False;
- } else {
- DEBUG(0,("%s => 0x%08X\n", oid, id));
- }
-
- oid = "1.2.840.113556.1.5.7000.5";
- status = dsdb_map_oid2int(oid, &id);
- if (!W_ERROR_IS_OK(status)) {
- DEBUG(0,("%s => %s\n", oid, win_errstr(status)));
- ret = False;
- } else {
- DEBUG(0,("%s => 0x%08X\n", oid, id));
- }
-
- oid = "1.2.840.113556.1.4.1716.";
- status = dsdb_map_oid2int(oid, &id);
- if (!W_ERROR_EQUAL(status, WERR_INVALID_PARAM)) {
- DEBUG(0,("%s => %s\n", oid, win_errstr(status)));
- ret = False;
- } else {
- DEBUG(0,("%s => %s (ok!)\n", oid, win_errstr(status)));
- }
-
- oid = "1.2.840.113556.1.4.65535.34";
- status = dsdb_map_oid2int(oid, &id);
- if (!W_ERROR_EQUAL(status, WERR_DS_NO_MSDS_INTID)) {
- DEBUG(0,("%s => %s\n", oid, win_errstr(status)));
- ret = False;
- } else {
- DEBUG(0,("%s => %s (ok!)\n", oid, win_errstr(status)));
- }
-
- oid = "1.2.840.113556.1.4..";
- status = dsdb_map_oid2int(oid, &id);
- if (!W_ERROR_EQUAL(status, WERR_INVALID_PARAM)) {
- DEBUG(0,("%s => %s\n", oid, win_errstr(status)));
- ret = False;
- } else {
- DEBUG(0,("%s => %s (ok!)\n", oid, win_errstr(status)));
- }
-
- oid = "1.2.840.113556.1.4.65536";
- status = dsdb_map_oid2int(oid, &id);
- if (!W_ERROR_EQUAL(status, WERR_INVALID_PARAM)) {
- DEBUG(0,("%s => %s\n", oid, win_errstr(status)));
- ret = False;
- } else {
- DEBUG(0,("%s => %s (ok!)\n", oid, win_errstr(status)));
- }
-
- oid = "5435.1.2.840.113556.1.4.";
- status = dsdb_map_oid2int(oid, &id);
- if (!W_ERROR_EQUAL(status, WERR_DS_NO_MSDS_INTID)) {
- DEBUG(0,("%s => %s\n", oid, win_errstr(status)));
- ret = False;
- } else {
- DEBUG(0,("%s => %s (ok!)\n", oid, win_errstr(status)));
- }
-
- id = 0xEF001234;
- status = dsdb_map_int2oid(id, torture, &oid);
- if (!W_ERROR_EQUAL(status, WERR_DS_NO_MSDS_INTID)) {
- DEBUG(0,("0x%08X => %s\n", id, win_errstr(status)));
- ret = False;
- } else {
- DEBUG(0,("0x%08X => %s (ok!)\n", id, win_errstr(status)));
- }
-
- return ret;
-}
-
BOOL torture_ldap_schema(struct torture_context *torture)
{
struct ldb_context *ldb;
@@ -497,8 +380,6 @@
ret &= test_dump_contructed(ldb, &rootDSE, schema);
ret &= test_dump_sorted_syntax(ldb, &rootDSE, schema);
- ret &= test_dsdb_map(torture);
-
failed:
return ret;
}
More information about the samba-cvs
mailing list