pyldb: added OID_COMPARATOR constants

This also changes the other constants to remove the LDB_ prefix, which
is redundent

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
index d456acbe4d48a595a0c7f02288d08cd914fd06a1..40efbb52cc35ccf40274acda07f8fa74fefe96df 100644 (file)
--- a/lib/ldb/pyldb.c
+++ b/lib/ldb/pyldb.c
@@ -3385,13 +3385,15 @@ void initldb(void)
 
        PyModule_AddObject(m, "__version__", PyString_FromString(PACKAGE_VERSION));
 
-#define ADD_LDB_STRING(val)  PyModule_AddObject(m, #val, PyString_FromString(val))
-
-       ADD_LDB_STRING(LDB_SYNTAX_DN);
-       ADD_LDB_STRING(LDB_SYNTAX_DN);
-       ADD_LDB_STRING(LDB_SYNTAX_DIRECTORY_STRING);
-       ADD_LDB_STRING(LDB_SYNTAX_INTEGER);
-       ADD_LDB_STRING(LDB_SYNTAX_BOOLEAN);
-       ADD_LDB_STRING(LDB_SYNTAX_OCTET_STRING);
-       ADD_LDB_STRING(LDB_SYNTAX_UTC_TIME);
+#define ADD_LDB_STRING(val)  PyModule_AddObject(m, #val, PyString_FromString(LDB_## val))
+
+       ADD_LDB_STRING(SYNTAX_DN);
+       ADD_LDB_STRING(SYNTAX_DN);
+       ADD_LDB_STRING(SYNTAX_DIRECTORY_STRING);
+       ADD_LDB_STRING(SYNTAX_INTEGER);
+       ADD_LDB_STRING(SYNTAX_BOOLEAN);
+       ADD_LDB_STRING(SYNTAX_OCTET_STRING);
+       ADD_LDB_STRING(SYNTAX_UTC_TIME);
+       ADD_LDB_STRING(OID_COMPARATOR_AND);
+       ADD_LDB_STRING(OID_COMPARATOR_OR);
 }

diff --git a/source4/scripting/python/samba/dbchecker.py b/source4/scripting/python/samba/dbchecker.py
index 85c7f80b91f658a2a162788d13c3d726698097bf..8b4d33b297bf8ccd4cb055a7bc8a1746524f8d73 100644 (file)
--- a/source4/scripting/python/samba/dbchecker.py
+++ b/source4/scripting/python/samba/dbchecker.py
@@ -459,7 +459,7 @@ class dbcheck(object):
                 list_attrs_seen.append(str(attrname).lower())
 
             if syntax_oid in [ dsdb.DSDB_SYNTAX_BINARY_DN, dsdb.DSDB_SYNTAX_OR_NAME,
-                               dsdb.DSDB_SYNTAX_STRING_DN, ldb.LDB_SYNTAX_DN ]:
+                               dsdb.DSDB_SYNTAX_STRING_DN, ldb.SYNTAX_DN ]:
                 # it's some form of DN, do specialised checking on those
                 error_count += self.check_dn(obj, attrname, syntax_oid)