s4-prefixmap: Use WERR_NOT_FOUND when OID is not found in current prefixMap

rather than WERR_DS_NO_MSDS_INTID.
WERR_DS_NO_MSDS_INTID is intended to be used for msDsIntId
attribute values handling

diff --git a/source4/dsdb/samdb/ldb_modules/schema_data.c b/source4/dsdb/samdb/ldb_modules/schema_data.c
index 7b7d7d09ff5e643bcca137deb7d43830eab74219..4818a54dcf5c52c94b53bade0bb5303f2fc97c3d 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/schema_data.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_data.c
@@ -191,7 +191,7 @@ static int schema_data_add(struct ldb_module *module, struct ldb_request *req)
        status = dsdb_schema_pfm_find_oid(schema->prefixmap, oid, NULL);
        if (!W_ERROR_IS_OK(status)) {
                /* check for internal errors */
-               if (!W_ERROR_EQUAL(WERR_DS_NO_MSDS_INTID, status)) {
+               if (!W_ERROR_EQUAL(status, WERR_NOT_FOUND)) {
                        ldb_debug_set(ldb, LDB_DEBUG_ERROR,
                                      "schema_data_add: failed to map %s[%s]: %s\n",
                                      oid_attr, oid, win_errstr(status));

diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c
index d80f2092ac65f5dcc8cfb4680ceba20ab354a528..4e1c14d019f2604c7ff14b04698e60e1fd6e5057 100644 (file)
--- a/source4/dsdb/schema/schema_init.c
+++ b/source4/dsdb/schema/schema_init.c
@@ -233,7 +233,7 @@ WERROR dsdb_create_prefix_mapping(struct ldb_context *ldb, struct dsdb_schema *s
                /* prefix found*/
                talloc_free(mem_ctx);
                return status;
-       } else if (!W_ERROR_EQUAL(WERR_DS_NO_MSDS_INTID, status)) {
+       } else if (!W_ERROR_EQUAL(status, WERR_NOT_FOUND)) {
                /* error */
                DEBUG(0,("dsdb_create_prefix_mapping: dsdb_find_prefix_for_oid: %s\n",
                        win_errstr(status)));

diff --git a/source4/dsdb/schema/schema_prefixmap.c b/source4/dsdb/schema/schema_prefixmap.c
index 79894fe272d42a2ee27d5d85df490492e4d258c7..86c6b8df8d3d2ad066bf18e47b9053b7556a86fe 100644 (file)
--- a/source4/dsdb/schema/schema_prefixmap.c
+++ b/source4/dsdb/schema/schema_prefixmap.c
@@ -229,7 +229,7 @@ WERROR dsdb_schema_pfm_find_binary_oid(const struct dsdb_schema_prefixmap *pfm,
                }
        }
 
-       return WERR_DS_NO_MSDS_INTID;
+       return WERR_NOT_FOUND;
 }
 
 /**