summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamenim@samba.org>2010-10-22 16:22:08 +0300
committerKamen Mazdrashki <kamenim@samba.org>2010-10-26 22:17:40 +0300
commit5e108fc5f94e6a08083f8852a59fc4b79b198af8 (patch)
tree551b203feacb189c3e6ea7c98de935065ccef6fc
parentd8e246cf8a4569baaa49359ceb3e21c7aa4af1f6 (diff)
downloadsamba-5e108fc5f94e6a08083f8852a59fc4b79b198af8.tar.gz
samba-5e108fc5f94e6a08083f8852a59fc4b79b198af8.tar.bz2
samba-5e108fc5f94e6a08083f8852a59fc4b79b198af8.zip
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
-rw-r--r--source4/dsdb/samdb/ldb_modules/schema_data.c2
-rw-r--r--source4/dsdb/schema/schema_init.c2
-rw-r--r--source4/dsdb/schema/schema_prefixmap.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/schema_data.c b/source4/dsdb/samdb/ldb_modules/schema_data.c
index 7b7d7d09ff..4818a54dcf 100644
--- 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 d80f2092ac..4e1c14d019 100644
--- 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 79894fe272..86c6b8df8d 100644
--- 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;
}
/**