s4-pydsdb: Use local memory context in py_dsdb_get_oid_from_attid()
[kamenim/samba.git] / source4 / dsdb / pydsdb.c
index 2471548babdc8421ab4f4d8811275aa64dfa58ab..1a51b86455483356a18b60396bf01bc575c5b9b4 100644 (file)
 
 #include <Python.h>
 #include "includes.h"
-#include "libcli/util/pyerrors.h"
+#include <ldb.h>
+#include <pyldb.h>
 #include "dsdb/samdb/samdb.h"
-#include "lib/ldb/pyldb.h"
 #include "libcli/security/security.h"
 #include "librpc/ndr/libndr.h"
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
 #include "librpc/rpc/pyrpc_util.h"
+#include "lib/policy/policy.h"
 
 /* There's no Py_ssize_t in 2.4, apparently */
 #if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 5
@@ -35,10 +36,6 @@ typedef inquiry lenfunc;
 typedef intargfunc ssizeargfunc;
 #endif
 
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
 /* FIXME: These should be in a header file somewhere, once we finish moving
  * away from SWIG .. */
 #define PyErr_LDB_OR_RAISE(py_ldb, ldb) \
@@ -80,6 +77,10 @@ static PyObject *py_samdb_server_site_name(PyObject *self, PyObject *args)
        PyErr_LDB_OR_RAISE(py_ldb, ldb);
 
        mem_ctx = talloc_new(NULL);
+       if (mem_ctx == NULL) {
+               PyErr_NoMemory();
+               return NULL;
+       }
 
        site = samdb_server_site_name(ldb, mem_ctx);
        if (site == NULL) {
@@ -132,8 +133,13 @@ static PyObject *py_samdb_set_domain_sid(PyLdbObject *self, PyObject *args)
        PyErr_LDB_OR_RAISE(py_ldb, ldb);
 
        sid = dom_sid_parse_talloc(NULL, PyString_AsString(py_sid));
+       if (sid == NULL) {
+               PyErr_NoMemory();
+               return NULL;
+       }
 
        ret = samdb_set_domain_sid(ldb, sid);
+       talloc_free(sid);
        if (!ret) {
                PyErr_SetString(PyExc_RuntimeError, "set_domain_sid failed");
                return NULL;
@@ -151,7 +157,7 @@ static PyObject *py_samdb_set_ntds_settings_dn(PyLdbObject *self, PyObject *args
 
        if (!PyArg_ParseTuple(args, "OO", &py_ldb, &py_ntds_settings_dn))
                return NULL;
-       
+
        PyErr_LDB_OR_RAISE(py_ldb, ldb);
 
        tmp_ctx = talloc_new(NULL);
@@ -161,6 +167,8 @@ static PyObject *py_samdb_set_ntds_settings_dn(PyLdbObject *self, PyObject *args
        }
 
        if (!PyObject_AsDn(tmp_ctx, py_ntds_settings_dn, ldb, &ntds_settings_dn)) {
+               /* exception thrown by "PyObject_AsDn" */
+               talloc_free(tmp_ctx);
                return NULL;
        }
 
@@ -183,15 +191,20 @@ static PyObject *py_samdb_get_domain_sid(PyLdbObject *self, PyObject *args)
 
        if (!PyArg_ParseTuple(args, "O", &py_ldb))
                return NULL;
-       
+
        PyErr_LDB_OR_RAISE(py_ldb, ldb);
 
        sid = samdb_domain_sid(ldb);
        if (!sid) {
                PyErr_SetString(PyExc_RuntimeError, "samdb_domain_sid failed");
                return NULL;
-       } 
+       }
+
        retstr = dom_sid_string(NULL, sid);
+       if (retstr == NULL) {
+               PyErr_NoMemory();
+               return NULL;
+       }
        ret = PyString_FromString(retstr);
        talloc_free(retstr);
        return ret;
@@ -201,17 +214,10 @@ static PyObject *py_samdb_ntds_invocation_id(PyObject *self, PyObject *args)
 {
        PyObject *py_ldb, *result;
        struct ldb_context *ldb;
-       TALLOC_CTX *mem_ctx;
        const struct GUID *guid;
-
-       mem_ctx = talloc_new(NULL);
-       if (mem_ctx == NULL) {
-               PyErr_NoMemory();
-               return NULL;
-       }
+       char *retstr;
 
        if (!PyArg_ParseTuple(args, "O", &py_ldb)) {
-               talloc_free(mem_ctx);
                return NULL;
        }
 
@@ -221,12 +227,16 @@ static PyObject *py_samdb_ntds_invocation_id(PyObject *self, PyObject *args)
        if (guid == NULL) {
                PyErr_SetString(PyExc_RuntimeError,
                                                "Failed to find NTDS invocation ID");
-               talloc_free(mem_ctx);
                return NULL;
        }
 
-       result = PyString_FromString(GUID_string(mem_ctx, guid));
-       talloc_free(mem_ctx);
+       retstr = GUID_string(NULL, guid);
+       if (retstr == NULL) {
+               PyErr_NoMemory();
+               return NULL;
+       }
+       result = PyString_FromString(retstr);
+       talloc_free(retstr);
        return result;
 }
 
@@ -238,22 +248,21 @@ static PyObject *py_dsdb_get_oid_from_attid(PyObject *self, PyObject *args)
        struct dsdb_schema *schema;
        const char *oid;
        PyObject *ret;
-       TALLOC_CTX *mem_ctx;
        WERROR status;
+       TALLOC_CTX *mem_ctx;
 
        if (!PyArg_ParseTuple(args, "Oi", &py_ldb, &attid))
                return NULL;
 
-       mem_ctx = talloc_new(NULL);
-       if (mem_ctx == NULL) {
-          PyErr_NoMemory();
-          return NULL;
-       }
-
        PyErr_LDB_OR_RAISE(py_ldb, ldb);
 
-       schema = dsdb_get_schema(ldb, NULL);
+       mem_ctx = talloc_new(NULL);
+       if (!mem_ctx) {
+               PyErr_NoMemory();
+               return NULL;
+       }
 
+       schema = dsdb_get_schema(ldb, mem_ctx);
        if (!schema) {
                PyErr_SetString(PyExc_RuntimeError, "Failed to find a schema from ldb \n");
                talloc_free(mem_ctx);
@@ -262,7 +271,11 @@ static PyObject *py_dsdb_get_oid_from_attid(PyObject *self, PyObject *args)
        
        status = dsdb_schema_pfm_oid_from_attid(schema->prefixmap, attid,
                                                mem_ctx, &oid);
-       PyErr_WERROR_IS_ERR_RAISE(status);
+       if (!W_ERROR_IS_OK(status)) {
+               PyErr_SetWERROR(status);
+               talloc_free(mem_ctx);
+               return NULL;
+       }
 
        ret = PyString_FromString(oid);
 
@@ -359,11 +372,28 @@ static PyObject *py_dsdb_DsReplicaAttribute(PyObject *self, PyObject *args)
        syntax_ctx.is_schema_nc = false;
 
        tmp_ctx = talloc_new(ldb);
+       if (tmp_ctx == NULL) {
+               PyErr_NoMemory();
+               return NULL;
+       }
 
        el = talloc_zero(tmp_ctx, struct ldb_message_element);
+       if (el == NULL) {
+               PyErr_NoMemory();
+               talloc_free(tmp_ctx);
+               return NULL;
+       }
+
        el->name = ldap_display_name;
        el->num_values = PyList_Size(el_list);
+
        el->values = talloc_array(el, struct ldb_val, el->num_values);
+       if (el->values == NULL) {
+               PyErr_NoMemory();
+               talloc_free(tmp_ctx);
+               return NULL;
+       }
+
        for (i = 0; i < el->num_values; i++) {
                PyObject *item = PyList_GetItem(el_list, i);
                if (!PyString_Check(item)) {
@@ -375,13 +405,18 @@ static PyObject *py_dsdb_DsReplicaAttribute(PyObject *self, PyObject *args)
        }
 
        attr = talloc_zero(tmp_ctx, struct drsuapi_DsReplicaAttribute);
+       if (attr == NULL) {
+               PyErr_NoMemory();
+               talloc_free(tmp_ctx);
+               return NULL;
+       }
 
        werr = a->syntax->ldb_to_drsuapi(&syntax_ctx, a, el, attr, attr);
        PyErr_WERROR_IS_ERR_RAISE(werr);
 
        ret = py_return_ndr_struct("samba.dcerpc.drsuapi", "DsReplicaAttribute", attr, attr);
 
-       talloc_unlink(ldb, tmp_ctx);
+       talloc_free(tmp_ctx);
 
        return ret;
 }
@@ -410,17 +445,10 @@ static PyObject *py_samdb_ntds_objectGUID(PyObject *self, PyObject *args)
 {
        PyObject *py_ldb, *result;
        struct ldb_context *ldb;
-       TALLOC_CTX *mem_ctx;
        const struct GUID *guid;
-
-       mem_ctx = talloc_new(NULL);
-       if (mem_ctx == NULL) {
-               PyErr_NoMemory();
-               return NULL;
-       }
+       char *retstr;
 
        if (!PyArg_ParseTuple(args, "O", &py_ldb)) {
-               talloc_free(mem_ctx);
                return NULL;
        }
 
@@ -429,12 +457,16 @@ static PyObject *py_samdb_ntds_objectGUID(PyObject *self, PyObject *args)
        guid = samdb_ntds_objectGUID(ldb);
        if (guid == NULL) {
                PyErr_SetString(PyExc_RuntimeError, "Failed to find NTDS GUID");
-               talloc_free(mem_ctx);
                return NULL;
        }
 
-       result = PyString_FromString(GUID_string(mem_ctx, guid));
-       talloc_free(mem_ctx);
+       retstr = GUID_string(NULL, guid);
+       if (retstr == NULL) {
+               PyErr_NoMemory();
+               return NULL;
+       }
+       result = PyString_FromString(retstr);
+       talloc_free(retstr);
        return result;
 }
 
@@ -463,19 +495,18 @@ static PyObject *py_dsdb_load_partition_usn(PyObject *self, PyObject *args)
        TALLOC_CTX *mem_ctx;
        int ret;
 
+       if (!PyArg_ParseTuple(args, "OO", &py_ldb, &py_dn)) {
+               return NULL;
+       }
+
+       PyErr_LDB_OR_RAISE(py_ldb, ldb);
+
        mem_ctx = talloc_new(NULL);
        if (mem_ctx == NULL) {
           PyErr_NoMemory();
           return NULL;
        }
 
-       if (!PyArg_ParseTuple(args, "OO", &py_ldb, &py_dn)) {
-          talloc_free(mem_ctx);
-          return NULL;
-       }
-
-       PyErr_LDB_OR_RAISE(py_ldb, ldb);
-
        if (!PyObject_AsDn(mem_ctx, py_dn, ldb, &dn)) {
           talloc_free(mem_ctx);
           return NULL;
@@ -483,8 +514,10 @@ static PyObject *py_dsdb_load_partition_usn(PyObject *self, PyObject *args)
 
        ret = dsdb_load_partition_usn(ldb, dn, &highest_uSN, &urgent_uSN);
        if (ret != LDB_SUCCESS) {
-          char *errstr = talloc_asprintf(mem_ctx, "Failed to load partition uSN - %s", ldb_errstring(ldb));
-          PyErr_SetString(PyExc_RuntimeError, errstr);
+          PyErr_Format(PyExc_RuntimeError,
+                       "Failed to load partition [%s] uSN - %s",
+                       ldb_dn_get_linearized(dn),
+                       ldb_errstring(ldb));
           talloc_free(mem_ctx);
           return NULL;
        }
@@ -594,7 +627,6 @@ static PyObject *py_dsdb_get_partitions_dn(PyObject *self, PyObject *args)
        struct ldb_context *ldb;
        struct ldb_dn *dn;
        PyObject *py_ldb, *ret;
-       TALLOC_CTX *tmp_ctx;
        PyObject *mod;
 
        mod = PyImport_ImportModule("ldb");
@@ -604,16 +636,13 @@ static PyObject *py_dsdb_get_partitions_dn(PyObject *self, PyObject *args)
 
        PyErr_LDB_OR_RAISE(py_ldb, ldb);
 
-       tmp_ctx = talloc_new(NULL);
-
-       dn = samdb_partitions_dn(ldb, tmp_ctx);
-
+       dn = samdb_partitions_dn(ldb, NULL);
        if (dn == NULL) {
-               talloc_free(tmp_ctx);
-               Py_RETURN_NONE;
+               PyErr_NoMemory();
+               return NULL;
        }
        ret = PyLdbDn_FromDn(dn);
-       talloc_free(tmp_ctx);
+       talloc_free(dn);
        return ret;
 }
 
@@ -634,7 +663,7 @@ static PyObject *py_dsdb_am_rodc(PyObject *self, PyObject *args)
        PyErr_LDB_OR_RAISE(py_ldb, ldb);
 
        ret = samdb_rodc(ldb, &am_rodc);
-       if (samdb_rodc(ldb, &am_rodc) != LDB_SUCCESS) {
+       if (ret != LDB_SUCCESS) {
                PyErr_SetString(PyExc_RuntimeError, ldb_errstring(ldb));
                return NULL;
        }
@@ -704,150 +733,131 @@ void initdsdb(void)
        if (m == NULL)
                return;
 
+#define ADD_DSDB_FLAG(val)  PyModule_AddObject(m, #val, PyInt_FromLong(val))
+
        /* "userAccountControl" flags */
-       PyModule_AddObject(m, "UF_NORMAL_ACCOUNT",
-                                          PyInt_FromLong(UF_NORMAL_ACCOUNT));
-       PyModule_AddObject(m, "UF_TEMP_DUPLICATE_ACCOUNT",
-                                          PyInt_FromLong(UF_TEMP_DUPLICATE_ACCOUNT));
-       PyModule_AddObject(m, "UF_SERVER_TRUST_ACCOUNT",
-                                          PyInt_FromLong(UF_SERVER_TRUST_ACCOUNT));
-       PyModule_AddObject(m, "UF_WORKSTATION_TRUST_ACCOUNT",
-                                          PyInt_FromLong(UF_WORKSTATION_TRUST_ACCOUNT));
-       PyModule_AddObject(m, "UF_INTERDOMAIN_TRUST_ACCOUNT",
-                                          PyInt_FromLong(UF_INTERDOMAIN_TRUST_ACCOUNT));
-       PyModule_AddObject(m, "UF_PASSWD_NOTREQD",
-                                          PyInt_FromLong(UF_PASSWD_NOTREQD));
-       PyModule_AddObject(m, "UF_ACCOUNTDISABLE",
-                                          PyInt_FromLong(UF_ACCOUNTDISABLE));
-
-       PyModule_AddObject(m, "UF_SCRIPT", PyInt_FromLong(UF_SCRIPT));
-       PyModule_AddObject(m, "UF_ACCOUNTDISABLE", PyInt_FromLong(UF_ACCOUNTDISABLE));
-       PyModule_AddObject(m, "UF_00000004", PyInt_FromLong(UF_00000004));
-       PyModule_AddObject(m, "UF_HOMEDIR_REQUIRED", PyInt_FromLong(UF_HOMEDIR_REQUIRED));
-       PyModule_AddObject(m, "UF_LOCKOUT", PyInt_FromLong(UF_LOCKOUT));
-       PyModule_AddObject(m, "UF_PASSWD_NOTREQD", PyInt_FromLong(UF_PASSWD_NOTREQD));
-       PyModule_AddObject(m, "UF_PASSWD_CANT_CHANGE", PyInt_FromLong(UF_PASSWD_CANT_CHANGE));
-       PyModule_AddObject(m, "UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED", PyInt_FromLong(UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED));
-       PyModule_AddObject(m, "UF_TEMP_DUPLICATE_ACCOUNT", PyInt_FromLong(UF_TEMP_DUPLICATE_ACCOUNT));
-       PyModule_AddObject(m, "UF_NORMAL_ACCOUNT", PyInt_FromLong(UF_NORMAL_ACCOUNT));
-       PyModule_AddObject(m, "UF_00000400", PyInt_FromLong(UF_00000400));
-       PyModule_AddObject(m, "UF_INTERDOMAIN_TRUST_ACCOUNT", PyInt_FromLong(UF_INTERDOMAIN_TRUST_ACCOUNT));
-       PyModule_AddObject(m, "UF_WORKSTATION_TRUST_ACCOUNT", PyInt_FromLong(UF_WORKSTATION_TRUST_ACCOUNT));
-       PyModule_AddObject(m, "UF_SERVER_TRUST_ACCOUNT", PyInt_FromLong(UF_SERVER_TRUST_ACCOUNT));
-       PyModule_AddObject(m, "UF_00004000", PyInt_FromLong(UF_00004000));
-       PyModule_AddObject(m, "UF_00008000", PyInt_FromLong(UF_00008000));
-       PyModule_AddObject(m, "UF_DONT_EXPIRE_PASSWD", PyInt_FromLong(UF_DONT_EXPIRE_PASSWD));
-       PyModule_AddObject(m, "UF_MNS_LOGON_ACCOUNT", PyInt_FromLong(UF_MNS_LOGON_ACCOUNT));
-       PyModule_AddObject(m, "UF_SMARTCARD_REQUIRED", PyInt_FromLong(UF_SMARTCARD_REQUIRED));
-       PyModule_AddObject(m, "UF_TRUSTED_FOR_DELEGATION", PyInt_FromLong(UF_TRUSTED_FOR_DELEGATION));
-       PyModule_AddObject(m, "UF_NOT_DELEGATED", PyInt_FromLong(UF_NOT_DELEGATED));
-       PyModule_AddObject(m, "UF_USE_DES_KEY_ONLY", PyInt_FromLong(UF_USE_DES_KEY_ONLY));
-       PyModule_AddObject(m, "UF_DONT_REQUIRE_PREAUTH", PyInt_FromLong(UF_DONT_REQUIRE_PREAUTH));
-       PyModule_AddObject(m, "UF_PASSWORD_EXPIRED", PyInt_FromLong(UF_PASSWORD_EXPIRED));
-       PyModule_AddObject(m, "UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION", PyInt_FromLong(UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION));
-       PyModule_AddObject(m, "UF_NO_AUTH_DATA_REQUIRED", PyInt_FromLong(UF_NO_AUTH_DATA_REQUIRED));
-       PyModule_AddObject(m, "UF_PARTIAL_SECRETS_ACCOUNT", PyInt_FromLong(UF_PARTIAL_SECRETS_ACCOUNT));
-
-       /* "groupType" flags */
-       PyModule_AddObject(m, "GTYPE_SECURITY_BUILTIN_LOCAL_GROUP",
-                                          PyInt_FromLong(GTYPE_SECURITY_BUILTIN_LOCAL_GROUP));
-       PyModule_AddObject(m, "GTYPE_SECURITY_GLOBAL_GROUP",
-                                          PyInt_FromLong(GTYPE_SECURITY_GLOBAL_GROUP));
-       PyModule_AddObject(m, "GTYPE_SECURITY_DOMAIN_LOCAL_GROUP",
-                                          PyInt_FromLong(GTYPE_SECURITY_DOMAIN_LOCAL_GROUP));
-       PyModule_AddObject(m, "GTYPE_SECURITY_UNIVERSAL_GROUP",
-                                          PyInt_FromLong(GTYPE_SECURITY_UNIVERSAL_GROUP));
-       PyModule_AddObject(m, "GTYPE_DISTRIBUTION_GLOBAL_GROUP",
-                                          PyInt_FromLong(GTYPE_DISTRIBUTION_GLOBAL_GROUP));
-       PyModule_AddObject(m, "GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP",
-                                          PyInt_FromLong(GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP));
-       PyModule_AddObject(m, "GTYPE_DISTRIBUTION_UNIVERSAL_GROUP",
-                                          PyInt_FromLong(GTYPE_DISTRIBUTION_UNIVERSAL_GROUP));
+       ADD_DSDB_FLAG(UF_NORMAL_ACCOUNT);
+       ADD_DSDB_FLAG(UF_TEMP_DUPLICATE_ACCOUNT);
+       ADD_DSDB_FLAG(UF_SERVER_TRUST_ACCOUNT);
+       ADD_DSDB_FLAG(UF_WORKSTATION_TRUST_ACCOUNT);
+       ADD_DSDB_FLAG(UF_INTERDOMAIN_TRUST_ACCOUNT);
+       ADD_DSDB_FLAG(UF_PASSWD_NOTREQD);
+       ADD_DSDB_FLAG(UF_ACCOUNTDISABLE);
+
+       ADD_DSDB_FLAG(UF_SCRIPT);
+       ADD_DSDB_FLAG(UF_ACCOUNTDISABLE);
+       ADD_DSDB_FLAG(UF_00000004);
+       ADD_DSDB_FLAG(UF_HOMEDIR_REQUIRED);
+       ADD_DSDB_FLAG(UF_LOCKOUT);
+       ADD_DSDB_FLAG(UF_PASSWD_NOTREQD);
+       ADD_DSDB_FLAG(UF_PASSWD_CANT_CHANGE);
+       ADD_DSDB_FLAG(UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED);
+       ADD_DSDB_FLAG(UF_TEMP_DUPLICATE_ACCOUNT);
+       ADD_DSDB_FLAG(UF_NORMAL_ACCOUNT);
+       ADD_DSDB_FLAG(UF_00000400);
+       ADD_DSDB_FLAG(UF_INTERDOMAIN_TRUST_ACCOUNT);
+       ADD_DSDB_FLAG(UF_WORKSTATION_TRUST_ACCOUNT);
+       ADD_DSDB_FLAG(UF_SERVER_TRUST_ACCOUNT);
+       ADD_DSDB_FLAG(UF_00004000);
+       ADD_DSDB_FLAG(UF_00008000);
+       ADD_DSDB_FLAG(UF_DONT_EXPIRE_PASSWD);
+       ADD_DSDB_FLAG(UF_MNS_LOGON_ACCOUNT);
+       ADD_DSDB_FLAG(UF_SMARTCARD_REQUIRED);
+       ADD_DSDB_FLAG(UF_TRUSTED_FOR_DELEGATION);
+       ADD_DSDB_FLAG(UF_NOT_DELEGATED);
+       ADD_DSDB_FLAG(UF_USE_DES_KEY_ONLY);
+       ADD_DSDB_FLAG(UF_DONT_REQUIRE_PREAUTH);
+       ADD_DSDB_FLAG(UF_PASSWORD_EXPIRED);
+       ADD_DSDB_FLAG(UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION);
+       ADD_DSDB_FLAG(UF_NO_AUTH_DATA_REQUIRED);
+       ADD_DSDB_FLAG(UF_PARTIAL_SECRETS_ACCOUNT);
+
+       /* groupType flags */
+       ADD_DSDB_FLAG(GTYPE_SECURITY_BUILTIN_LOCAL_GROUP);
+       ADD_DSDB_FLAG(GTYPE_SECURITY_GLOBAL_GROUP);
+       ADD_DSDB_FLAG(GTYPE_SECURITY_DOMAIN_LOCAL_GROUP);
+       ADD_DSDB_FLAG(GTYPE_SECURITY_UNIVERSAL_GROUP);
+       ADD_DSDB_FLAG(GTYPE_DISTRIBUTION_GLOBAL_GROUP);
+       ADD_DSDB_FLAG(GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP);
+       ADD_DSDB_FLAG(GTYPE_DISTRIBUTION_UNIVERSAL_GROUP);
 
        /* "sAMAccountType" flags */
-       PyModule_AddObject(m, "ATYPE_NORMAL_ACCOUNT",
-                                          PyInt_FromLong(ATYPE_NORMAL_ACCOUNT));
-       PyModule_AddObject(m, "ATYPE_WORKSTATION_TRUST",
-                                          PyInt_FromLong(ATYPE_WORKSTATION_TRUST));
-       PyModule_AddObject(m, "ATYPE_INTERDOMAIN_TRUST",
-                                          PyInt_FromLong(ATYPE_INTERDOMAIN_TRUST));
-       PyModule_AddObject(m, "ATYPE_SECURITY_GLOBAL_GROUP",
-                                          PyInt_FromLong(ATYPE_SECURITY_GLOBAL_GROUP));
-       PyModule_AddObject(m, "ATYPE_SECURITY_LOCAL_GROUP",
-                                          PyInt_FromLong(ATYPE_SECURITY_LOCAL_GROUP));
-       PyModule_AddObject(m, "ATYPE_SECURITY_UNIVERSAL_GROUP",
-                                          PyInt_FromLong(ATYPE_SECURITY_UNIVERSAL_GROUP));
-       PyModule_AddObject(m, "ATYPE_DISTRIBUTION_GLOBAL_GROUP",
-                                          PyInt_FromLong(ATYPE_DISTRIBUTION_GLOBAL_GROUP));
-       PyModule_AddObject(m, "ATYPE_DISTRIBUTION_LOCAL_GROUP",
-                                          PyInt_FromLong(ATYPE_DISTRIBUTION_LOCAL_GROUP));
-       PyModule_AddObject(m, "ATYPE_DISTRIBUTION_UNIVERSAL_GROUP",
-                                          PyInt_FromLong(ATYPE_DISTRIBUTION_UNIVERSAL_GROUP));
+       ADD_DSDB_FLAG(ATYPE_NORMAL_ACCOUNT);
+       ADD_DSDB_FLAG(ATYPE_WORKSTATION_TRUST);
+       ADD_DSDB_FLAG(ATYPE_INTERDOMAIN_TRUST);
+       ADD_DSDB_FLAG(ATYPE_SECURITY_GLOBAL_GROUP);
+       ADD_DSDB_FLAG(ATYPE_SECURITY_LOCAL_GROUP);
+       ADD_DSDB_FLAG(ATYPE_SECURITY_UNIVERSAL_GROUP);
+       ADD_DSDB_FLAG(ATYPE_DISTRIBUTION_GLOBAL_GROUP);
+       ADD_DSDB_FLAG(ATYPE_DISTRIBUTION_LOCAL_GROUP);
+       ADD_DSDB_FLAG(ATYPE_DISTRIBUTION_UNIVERSAL_GROUP);
 
        /* "domainFunctionality", "forestFunctionality" flags in the rootDSE */
-       PyModule_AddObject(m, "DS_DOMAIN_FUNCTION_2000",
-                                          PyInt_FromLong(DS_DOMAIN_FUNCTION_2000));
-       PyModule_AddObject(m, "DS_DOMAIN_FUNCTION_2003_MIXED",
-                                          PyInt_FromLong(DS_DOMAIN_FUNCTION_2003_MIXED));
-       PyModule_AddObject(m, "DS_DOMAIN_FUNCTION_2003",
-                                          PyInt_FromLong(DS_DOMAIN_FUNCTION_2003));
-       PyModule_AddObject(m, "DS_DOMAIN_FUNCTION_2008",
-                                          PyInt_FromLong(DS_DOMAIN_FUNCTION_2008));
-       PyModule_AddObject(m, "DS_DOMAIN_FUNCTION_2008_R2",
-                                          PyInt_FromLong(DS_DOMAIN_FUNCTION_2008_R2));
+       ADD_DSDB_FLAG(DS_DOMAIN_FUNCTION_2000);
+       ADD_DSDB_FLAG(DS_DOMAIN_FUNCTION_2003_MIXED);
+       ADD_DSDB_FLAG(DS_DOMAIN_FUNCTION_2003);
+       ADD_DSDB_FLAG(DS_DOMAIN_FUNCTION_2008);
+       ADD_DSDB_FLAG(DS_DOMAIN_FUNCTION_2008_R2);
 
        /* "systemFlags" */
-       PyModule_AddObject(m, "SYSTEM_FLAG_CR_NTDS_NC",
-                                       PyInt_FromLong(SYSTEM_FLAG_CR_NTDS_NC));
-       PyModule_AddObject(m, "SYSTEM_FLAG_CR_NTDS_DOMAIN",
-                                       PyInt_FromLong(SYSTEM_FLAG_CR_NTDS_DOMAIN));
-       PyModule_AddObject(m, "SYSTEM_FLAG_CR_NTDS_NOT_GC_REPLICATED",
-                                       PyInt_FromLong(SYSTEM_FLAG_CR_NTDS_NOT_GC_REPLICATED));
-       PyModule_AddObject(m, "SYSTEM_FLAG_SCHEMA_BASE_OBJECT",
-                                       PyInt_FromLong(SYSTEM_FLAG_SCHEMA_BASE_OBJECT));
-       PyModule_AddObject(m, "SYSTEM_FLAG_ATTR_IS_RDN",
-                                       PyInt_FromLong(SYSTEM_FLAG_ATTR_IS_RDN));
-       PyModule_AddObject(m, "SYSTEM_FLAG_DISALLOW_MOVE_ON_DELETE",
-                                       PyInt_FromLong(SYSTEM_FLAG_DISALLOW_MOVE_ON_DELETE));
-       PyModule_AddObject(m, "SYSTEM_FLAG_DOMAIN_DISALLOW_MOVE",
-                                       PyInt_FromLong(SYSTEM_FLAG_DOMAIN_DISALLOW_MOVE));
-       PyModule_AddObject(m, "SYSTEM_FLAG_DOMAIN_DISALLOW_RENAME",
-                                       PyInt_FromLong(SYSTEM_FLAG_DOMAIN_DISALLOW_RENAME));
-       PyModule_AddObject(m, "SYSTEM_FLAG_CONFIG_ALLOW_LIMITED_MOVE",
-                                       PyInt_FromLong(SYSTEM_FLAG_CONFIG_ALLOW_LIMITED_MOVE));
-       PyModule_AddObject(m, "SYSTEM_FLAG_CONFIG_ALLOW_MOVE",
-                                       PyInt_FromLong(SYSTEM_FLAG_CONFIG_ALLOW_MOVE));
-       PyModule_AddObject(m, "SYSTEM_FLAG_CONFIG_ALLOW_RENAME",
-                                       PyInt_FromLong(SYSTEM_FLAG_CONFIG_ALLOW_RENAME));
-       PyModule_AddObject(m, "SYSTEM_FLAG_DISALLOW_DELETE",
-                                       PyInt_FromLong(SYSTEM_FLAG_DISALLOW_DELETE));
+       ADD_DSDB_FLAG(SYSTEM_FLAG_CR_NTDS_NC);
+       ADD_DSDB_FLAG(SYSTEM_FLAG_CR_NTDS_DOMAIN);
+       ADD_DSDB_FLAG(SYSTEM_FLAG_CR_NTDS_NOT_GC_REPLICATED);
+       ADD_DSDB_FLAG(SYSTEM_FLAG_SCHEMA_BASE_OBJECT);
+       ADD_DSDB_FLAG(SYSTEM_FLAG_ATTR_IS_RDN);
+       ADD_DSDB_FLAG(SYSTEM_FLAG_DISALLOW_MOVE_ON_DELETE);
+       ADD_DSDB_FLAG(SYSTEM_FLAG_DOMAIN_DISALLOW_MOVE);
+       ADD_DSDB_FLAG(SYSTEM_FLAG_DOMAIN_DISALLOW_RENAME);
+       ADD_DSDB_FLAG(SYSTEM_FLAG_CONFIG_ALLOW_LIMITED_MOVE);
+       ADD_DSDB_FLAG(SYSTEM_FLAG_CONFIG_ALLOW_MOVE);
+       ADD_DSDB_FLAG(SYSTEM_FLAG_CONFIG_ALLOW_RENAME);
+       ADD_DSDB_FLAG(SYSTEM_FLAG_DISALLOW_DELETE);
 
        /* Kerberos encryption type constants */
-       PyModule_AddObject(m, "ENC_ALL_TYPES",
-                          PyInt_FromLong(ENC_ALL_TYPES));
-       PyModule_AddObject(m, "ENC_CRC32",
-                          PyInt_FromLong(ENC_CRC32));
-       PyModule_AddObject(m, "ENC_RSA_MD5",
-                          PyInt_FromLong(ENC_RSA_MD5));
-       PyModule_AddObject(m, "ENC_RC4_HMAC_MD5",
-                          PyInt_FromLong(ENC_RC4_HMAC_MD5));
-       PyModule_AddObject(m, "ENC_HMAC_SHA1_96_AES128",
-                          PyInt_FromLong(ENC_HMAC_SHA1_96_AES128));
-       PyModule_AddObject(m, "ENC_HMAC_SHA1_96_AES256",
-                          PyInt_FromLong(ENC_HMAC_SHA1_96_AES256));
-
-       PyModule_AddObject(m, "SEARCH_FLAG_ATTINDEX", PyInt_FromLong(SEARCH_FLAG_ATTINDEX));
-       PyModule_AddObject(m, "SEARCH_FLAG_PDNTATTINDEX", PyInt_FromLong(SEARCH_FLAG_PDNTATTINDEX));
-       PyModule_AddObject(m, "SEARCH_FLAG_ANR", PyInt_FromLong(SEARCH_FLAG_ANR));
-       PyModule_AddObject(m, "SEARCH_FLAG_PRESERVEONDELETE", PyInt_FromLong(SEARCH_FLAG_PRESERVEONDELETE));
-       PyModule_AddObject(m, "SEARCH_FLAG_COPY", PyInt_FromLong(SEARCH_FLAG_COPY));
-       PyModule_AddObject(m, "SEARCH_FLAG_TUPLEINDEX", PyInt_FromLong(SEARCH_FLAG_TUPLEINDEX));
-       PyModule_AddObject(m, "SEARCH_FLAG_SUBTREEATTRINDEX", PyInt_FromLong(SEARCH_FLAG_SUBTREEATTRINDEX));
-       PyModule_AddObject(m, "SEARCH_FLAG_CONFIDENTIAL", PyInt_FromLong(SEARCH_FLAG_CONFIDENTIAL));
-       PyModule_AddObject(m, "SEARCH_FLAG_NEVERVALUEAUDIT", PyInt_FromLong(SEARCH_FLAG_NEVERVALUEAUDIT));
-       PyModule_AddObject(m, "SEARCH_FLAG_RODC_ATTRIBUTE", PyInt_FromLong(SEARCH_FLAG_RODC_ATTRIBUTE));
-
-       PyModule_AddObject(m, "DS_FLAG_ATTR_NOT_REPLICATED", PyInt_FromLong(DS_FLAG_ATTR_NOT_REPLICATED));
-       PyModule_AddObject(m, "DS_FLAG_ATTR_REQ_PARTIAL_SET_MEMBER", PyInt_FromLong(DS_FLAG_ATTR_REQ_PARTIAL_SET_MEMBER));
-       PyModule_AddObject(m, "DS_FLAG_ATTR_IS_CONSTRUCTED", PyInt_FromLong(DS_FLAG_ATTR_IS_CONSTRUCTED));
+       ADD_DSDB_FLAG(ENC_ALL_TYPES);
+       ADD_DSDB_FLAG(ENC_CRC32);
+       ADD_DSDB_FLAG(ENC_RSA_MD5);
+       ADD_DSDB_FLAG(ENC_RC4_HMAC_MD5);
+       ADD_DSDB_FLAG(ENC_HMAC_SHA1_96_AES128);
+       ADD_DSDB_FLAG(ENC_HMAC_SHA1_96_AES256);
+
+       ADD_DSDB_FLAG(SEARCH_FLAG_ATTINDEX);
+       ADD_DSDB_FLAG(SEARCH_FLAG_PDNTATTINDEX);
+       ADD_DSDB_FLAG(SEARCH_FLAG_ANR);
+       ADD_DSDB_FLAG(SEARCH_FLAG_PRESERVEONDELETE);
+       ADD_DSDB_FLAG(SEARCH_FLAG_COPY);
+       ADD_DSDB_FLAG(SEARCH_FLAG_TUPLEINDEX);
+       ADD_DSDB_FLAG(SEARCH_FLAG_SUBTREEATTRINDEX);
+       ADD_DSDB_FLAG(SEARCH_FLAG_CONFIDENTIAL);
+       ADD_DSDB_FLAG(SEARCH_FLAG_NEVERVALUEAUDIT);
+       ADD_DSDB_FLAG(SEARCH_FLAG_RODC_ATTRIBUTE);
+
+       ADD_DSDB_FLAG(DS_FLAG_ATTR_NOT_REPLICATED);
+       ADD_DSDB_FLAG(DS_FLAG_ATTR_REQ_PARTIAL_SET_MEMBER);
+       ADD_DSDB_FLAG(DS_FLAG_ATTR_IS_CONSTRUCTED);
+
+       ADD_DSDB_FLAG(DS_NTDSDSA_OPT_IS_GC);
+       ADD_DSDB_FLAG(DS_NTDSDSA_OPT_DISABLE_INBOUND_REPL);
+       ADD_DSDB_FLAG(DS_NTDSDSA_OPT_DISABLE_OUTBOUND_REPL);
+       ADD_DSDB_FLAG(DS_NTDSDSA_OPT_DISABLE_NTDSCONN_XLATE);
+       ADD_DSDB_FLAG(DS_NTDSDSA_OPT_DISABLE_SPN_REGISTRATION);
+
+       ADD_DSDB_FLAG(NTDSCONN_KCC_GC_TOPOLOGY);
+       ADD_DSDB_FLAG(NTDSCONN_KCC_RING_TOPOLOGY);
+       ADD_DSDB_FLAG(NTDSCONN_KCC_MINIMIZE_HOPS_TOPOLOGY);
+       ADD_DSDB_FLAG(NTDSCONN_KCC_STALE_SERVERS_TOPOLOGY);
+       ADD_DSDB_FLAG(NTDSCONN_KCC_OSCILLATING_CONNECTION_TOPOLOGY);
+       ADD_DSDB_FLAG(NTDSCONN_KCC_INTERSITE_GC_TOPOLOGY);
+       ADD_DSDB_FLAG(NTDSCONN_KCC_INTERSITE_TOPOLOGY);
+       ADD_DSDB_FLAG(NTDSCONN_KCC_SERVER_FAILOVER_TOPOLOGY);
+       ADD_DSDB_FLAG(NTDSCONN_KCC_SITE_FAILOVER_TOPOLOGY);
+       ADD_DSDB_FLAG(NTDSCONN_KCC_REDUNDANT_SERVER_TOPOLOGY);
+
+       /* GPO policy flags */
+       ADD_DSDB_FLAG(GPLINK_OPT_DISABLE);
+       ADD_DSDB_FLAG(GPLINK_OPT_ENFORCE);
+       ADD_DSDB_FLAG(GPO_FLAG_USER_DISABLE);
+       ADD_DSDB_FLAG(GPO_FLAG_MACHINE_DISABLE);
+       ADD_DSDB_FLAG(GPO_INHERIT);
+       ADD_DSDB_FLAG(GPO_BLOCK_INHERITANCE);
 }