diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-08-31 15:55:27 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-09-01 15:23:09 +1000 |
| commit | 8ab3c843b1bf0f60a7d6b68411931d204b6f882b (patch) | |
| tree | e4cd3b2bdd69882b97309f715a151b28ef93b8d7 | |
| parent | 7dba93ac4170bfb17bbd579fa9578391e07667f0 (diff) | |
| download | samba-8ab3c843b1bf0f60a7d6b68411931d204b6f882b.tar.gz samba-8ab3c843b1bf0f60a7d6b68411931d204b6f882b.tar.bz2 samba-8ab3c843b1bf0f60a7d6b68411931d204b6f882b.zip | |
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>
| -rw-r--r-- | lib/ldb/pyldb.c | 20 | ||||
| -rw-r--r-- | source4/scripting/python/samba/dbchecker.py | 2 |
2 files changed, 12 insertions, 10 deletions
diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c index d456acbe4d..40efbb52cc 100644 --- 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 85c7f80b91..8b4d33b297 100644 --- 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) |