diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-09-12 07:45:28 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-09-12 07:45:28 +1000 |
| commit | acf11ddd5fbb9e4b0b780f4f95957d79fcc6fcf1 (patch) | |
| tree | 9632fa85c4ba96cfc06ef46b6e77874ac4c2185e /source4 | |
| parent | ab555eb1990f81942bf119bb42e922c92b2e932b (diff) | |
| download | samba-acf11ddd5fbb9e4b0b780f4f95957d79fcc6fcf1.tar.gz samba-acf11ddd5fbb9e4b0b780f4f95957d79fcc6fcf1.tar.bz2 samba-acf11ddd5fbb9e4b0b780f4f95957d79fcc6fcf1.zip | |
Fix failure to load the schema on read-only DB.
This also tries to simplify the logic in the schema -> @ATTRIBUTES and
@INDEXES code.
Andrew Bartlett
(This used to be commit a383b8bf88a5681f9c9c6839ba645c872a735051)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/dsdb/schema/schema_set.c | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/source4/dsdb/schema/schema_set.c b/source4/dsdb/schema/schema_set.c index 3f5ddd8446..2303b88a05 100644 --- a/source4/dsdb/schema/schema_set.c +++ b/source4/dsdb/schema/schema_set.c @@ -79,13 +79,13 @@ static int dsdb_schema_set_attributes(struct ldb_context *ldb, struct dsdb_schem ret = ldb_msg_add_string(msg, attr->lDAPDisplayName, "CASE_INSENSITIVE"); } if (ret != LDB_SUCCESS) { - return ret; + break; } if (attr->searchFlags & SEARCH_FLAG_ATTINDEX) { ret = ldb_msg_add_string(msg_idx, "@IDXATTR", attr->lDAPDisplayName); if (ret != LDB_SUCCESS) { - return ret; + break; } } @@ -105,11 +105,11 @@ static int dsdb_schema_set_attributes(struct ldb_context *ldb, struct dsdb_schem } if (ret != LDB_SUCCESS) { - return ret; + break; } } - if (!write_attributes) { + if (!write_attributes || ret != LDB_SUCCESS) { talloc_free(mem_ctx); return ret; } @@ -120,19 +120,13 @@ static int dsdb_schema_set_attributes(struct ldb_context *ldb, struct dsdb_schem if (ret == LDB_ERR_NO_SUCH_OBJECT) { ret = ldb_add(ldb, msg); } else if (ret != LDB_SUCCESS) { - talloc_free(mem_ctx); - return ret; + } else if (res->count != 1) { + ret = ldb_add(ldb, msg); } else { - - if (res->count != 1) { - talloc_free(mem_ctx); - return LDB_ERR_NO_SUCH_OBJECT; - } - ret = LDB_SUCCESS; /* Annoyingly added to our search results */ ldb_msg_remove_attr(res->msgs[0], "distinguishedName"); - + mod_msg = ldb_msg_diff(ldb, res->msgs[0], msg); if (mod_msg->num_elements > 0) { ret = ldb_modify(ldb, mod_msg); @@ -141,10 +135,11 @@ static int dsdb_schema_set_attributes(struct ldb_context *ldb, struct dsdb_schem if (ret == LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS) { /* We might be on a read-only DB */ + ret = LDB_SUCCESS; + } + if (ret != LDB_SUCCESS) { talloc_free(mem_ctx); return ret; - } else if (ret != LDB_SUCCESS) { - return ret; } /* Now write out the indexs, as found in the schema (if they have changed) */ @@ -153,14 +148,10 @@ static int dsdb_schema_set_attributes(struct ldb_context *ldb, struct dsdb_schem if (ret == LDB_ERR_NO_SUCH_OBJECT) { ret = ldb_add(ldb, msg_idx); } else if (ret != LDB_SUCCESS) { - talloc_free(mem_ctx); - return ret; + } else if (res->count != 1) { + ret = ldb_add(ldb, msg_idx); } else { - if (res_idx->count != 1) { - talloc_free(mem_ctx); - return LDB_ERR_NO_SUCH_OBJECT; - } - + ret = LDB_SUCCESS; /* Annoyingly added to our search results */ ldb_msg_remove_attr(res_idx->msgs[0], "distinguishedName"); @@ -171,7 +162,6 @@ static int dsdb_schema_set_attributes(struct ldb_context *ldb, struct dsdb_schem } if (ret == LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS) { /* We might be on a read-only DB */ - talloc_free(mem_ctx); ret = LDB_SUCCESS; } talloc_free(mem_ctx); |