s4:dsdb: Fix warnings about not set / set but unused / shadowed variables

[metze/samba/wip.git] / source4 / dsdb / samdb / ldb_modules / resolve_oids.c

diff --git a/source4/dsdb/samdb/ldb_modules/resolve_oids.c b/source4/dsdb/samdb/ldb_modules/resolve_oids.c
index c18cd2f6f4976559ff7a4a665c015dab07af7c89..b5c5f8efee7ddb911bb2ac7c66868b92841bec89 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/resolve_oids.c
+++ b/source4/dsdb/samdb/ldb_modules/resolve_oids.c
@@ -46,11 +46,11 @@ static int resolve_oids_need_value(struct ldb_context *ldb,
        }
 
        switch (a->attributeID_id) {
-       case DRSUAPI_ATTRIBUTE_objectClass:
-       case DRSUAPI_ATTRIBUTE_subClassOf:
-       case DRSUAPI_ATTRIBUTE_auxiliaryClass:
-       case DRSUAPI_ATTRIBUTE_systemPossSuperiors:
-       case DRSUAPI_ATTRIBUTE_possSuperiors:
+       case DRSUAPI_ATTID_objectClass:
+       case DRSUAPI_ATTID_subClassOf:
+       case DRSUAPI_ATTID_auxiliaryClass:
+       case DRSUAPI_ATTID_systemPossSuperiors:
+       case DRSUAPI_ATTID_possSuperiors:
                str = talloc_strndup(ldb, (char *)valp->data, valp->length);
                if (!str) {
                        return ldb_oom(ldb);
@@ -61,10 +61,10 @@ static int resolve_oids_need_value(struct ldb_context *ldb,
                        return LDB_ERR_COMPARE_FALSE;
                }
                return LDB_ERR_COMPARE_TRUE;
-       case DRSUAPI_ATTRIBUTE_systemMustContain:
-       case DRSUAPI_ATTRIBUTE_systemMayContain:
-       case DRSUAPI_ATTRIBUTE_mustContain:
-       case DRSUAPI_ATTRIBUTE_mayContain:
+       case DRSUAPI_ATTID_systemMustContain:
+       case DRSUAPI_ATTID_systemMayContain:
+       case DRSUAPI_ATTID_mustContain:
+       case DRSUAPI_ATTID_mayContain:
                str = talloc_strndup(ldb, (char *)valp->data, valp->length);
                if (!str) {
                        return ldb_oom(ldb);
@@ -75,9 +75,9 @@ static int resolve_oids_need_value(struct ldb_context *ldb,
                        return LDB_ERR_COMPARE_FALSE;
                }
                return LDB_ERR_COMPARE_TRUE;
-       case DRSUAPI_ATTRIBUTE_governsID:
-       case DRSUAPI_ATTRIBUTE_attributeID:
-       case DRSUAPI_ATTRIBUTE_attributeSyntax:
+       case DRSUAPI_ATTID_governsID:
+       case DRSUAPI_ATTID_attributeID:
+       case DRSUAPI_ATTID_attributeSyntax:
                return LDB_ERR_COMPARE_FALSE;
        }
 
@@ -233,11 +233,11 @@ static int resolve_oids_replace_value(struct ldb_context *ldb,
        }
 
        switch (a->attributeID_id) {
-       case DRSUAPI_ATTRIBUTE_objectClass:
-       case DRSUAPI_ATTRIBUTE_subClassOf:
-       case DRSUAPI_ATTRIBUTE_auxiliaryClass:
-       case DRSUAPI_ATTRIBUTE_systemPossSuperiors:
-       case DRSUAPI_ATTRIBUTE_possSuperiors:
+       case DRSUAPI_ATTID_objectClass:
+       case DRSUAPI_ATTID_subClassOf:
+       case DRSUAPI_ATTID_auxiliaryClass:
+       case DRSUAPI_ATTID_systemPossSuperiors:
+       case DRSUAPI_ATTID_possSuperiors:
                str = talloc_strndup(schema, (char *)valp->data, valp->length);
                if (!str) {
                        return ldb_oom(ldb);
@@ -249,10 +249,10 @@ static int resolve_oids_replace_value(struct ldb_context *ldb,
                }
                *valp = data_blob_string_const(vo->lDAPDisplayName);
                return LDB_SUCCESS;
-       case DRSUAPI_ATTRIBUTE_systemMustContain:
-       case DRSUAPI_ATTRIBUTE_systemMayContain:
-       case DRSUAPI_ATTRIBUTE_mustContain:
-       case DRSUAPI_ATTRIBUTE_mayContain:
+       case DRSUAPI_ATTID_systemMustContain:
+       case DRSUAPI_ATTID_systemMayContain:
+       case DRSUAPI_ATTID_mustContain:
+       case DRSUAPI_ATTID_mayContain:
                str = talloc_strndup(schema, (char *)valp->data, valp->length);
                if (!str) {
                        return ldb_oom(ldb);
@@ -264,9 +264,9 @@ static int resolve_oids_replace_value(struct ldb_context *ldb,
                }
                *valp = data_blob_string_const(va->lDAPDisplayName);
                return LDB_SUCCESS;
-       case DRSUAPI_ATTRIBUTE_governsID:
-       case DRSUAPI_ATTRIBUTE_attributeID:
-       case DRSUAPI_ATTRIBUTE_attributeSyntax:
+       case DRSUAPI_ATTID_governsID:
+       case DRSUAPI_ATTID_attributeID:
+       case DRSUAPI_ATTID_attributeSyntax:
                return LDB_SUCCESS;
        }
 
@@ -412,11 +412,9 @@ struct resolve_oids_context {
 
 static int resolve_oids_callback(struct ldb_request *req, struct ldb_reply *ares)
 {
-       struct ldb_context *ldb;
        struct resolve_oids_context *ac;
 
        ac = talloc_get_type_abort(req->context, struct resolve_oids_context);
-       ldb = ldb_module_get_ctx(ac->module);
 
        if (!ares) {
                return ldb_module_done(ac->req, NULL, NULL,
@@ -691,10 +689,16 @@ static int resolve_oids_modify(struct ldb_module *module, struct ldb_request *re
        return ldb_next_request(module, down_req);
 }
 
-_PUBLIC_ const struct ldb_module_ops ldb_resolve_oids_module_ops = {
+static const struct ldb_module_ops ldb_resolve_oids_module_ops = {
        .name           = "resolve_oids",
        .search         = resolve_oids_search,
        .add            = resolve_oids_add,
        .modify         = resolve_oids_modify,
 };
 
+
+int ldb_resolve_oids_module_init(const char *version)
+{
+       LDB_MODULE_CHECK_VERSION(version);
+       return ldb_register_module(&ldb_resolve_oids_module_ops);
+}