mirror of
https://github.com/samba-team/samba.git
synced 2025-03-05 20:58:40 +03:00
s4:dsdb Ensure we free old schema copies
It was reported by aatanasov that we kept around one whole schema per modification made. This does not fix that, but I hope moves us closer to a fix The most important part of the fix is that: - if (schema_out != schema_in) { - talloc_unlink(schema_in, ldb); - } was the wrong way around. This is now handled in the schema_set calls. Andrew Bartlett
This commit is contained in:
parent
5a66edc99e
commit
c48279896d
@ -366,6 +366,7 @@ int dsdb_setup_schema_inversion(struct ldb_context *ldb, struct dsdb_schema *sch
|
|||||||
|
|
||||||
int dsdb_set_schema(struct ldb_context *ldb, struct dsdb_schema *schema)
|
int dsdb_set_schema(struct ldb_context *ldb, struct dsdb_schema *schema)
|
||||||
{
|
{
|
||||||
|
struct dsdb_schema *old_schema;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = dsdb_setup_sorted_accessors(ldb, schema);
|
ret = dsdb_setup_sorted_accessors(ldb, schema);
|
||||||
@ -378,10 +379,17 @@ int dsdb_set_schema(struct ldb_context *ldb, struct dsdb_schema *schema)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
old_schema = ldb_get_opaque(ldb, "dsdb_schema");
|
||||||
|
|
||||||
ret = ldb_set_opaque(ldb, "dsdb_schema", schema);
|
ret = ldb_set_opaque(ldb, "dsdb_schema", schema);
|
||||||
if (ret != LDB_SUCCESS) {
|
if (ret != LDB_SUCCESS) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
/* Remove the refernece to the schema we just overwrote - if there was none, NULL is harmless here */
|
||||||
|
if (old_schema != schema) {
|
||||||
|
talloc_unlink(ldb, old_schema);
|
||||||
|
talloc_steal(ldb, schema);
|
||||||
|
}
|
||||||
|
|
||||||
ret = ldb_set_opaque(ldb, "dsdb_use_global_schema", NULL);
|
ret = ldb_set_opaque(ldb, "dsdb_use_global_schema", NULL);
|
||||||
if (ret != LDB_SUCCESS) {
|
if (ret != LDB_SUCCESS) {
|
||||||
@ -394,8 +402,6 @@ int dsdb_set_schema(struct ldb_context *ldb, struct dsdb_schema *schema)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
talloc_steal(ldb, schema);
|
|
||||||
|
|
||||||
return LDB_SUCCESS;
|
return LDB_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -411,11 +417,16 @@ int dsdb_reference_schema(struct ldb_context *ldb, struct dsdb_schema *schema,
|
|||||||
bool write_attributes)
|
bool write_attributes)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
struct dsdb_schema *old_schema;
|
||||||
|
old_schema = ldb_get_opaque(ldb, "dsdb_schema");
|
||||||
ret = ldb_set_opaque(ldb, "dsdb_schema", schema);
|
ret = ldb_set_opaque(ldb, "dsdb_schema", schema);
|
||||||
if (ret != LDB_SUCCESS) {
|
if (ret != LDB_SUCCESS) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Remove the refernece to the schema we just overwrote - if there was none, NULL is harmless here */
|
||||||
|
talloc_unlink(ldb, old_schema);
|
||||||
|
|
||||||
if (talloc_reference(ldb, schema) == NULL) {
|
if (talloc_reference(ldb, schema) == NULL) {
|
||||||
return LDB_ERR_OPERATIONS_ERROR;
|
return LDB_ERR_OPERATIONS_ERROR;
|
||||||
}
|
}
|
||||||
@ -438,7 +449,6 @@ int dsdb_set_global_schema(struct ldb_context *ldb)
|
|||||||
if (!global_schema) {
|
if (!global_schema) {
|
||||||
return LDB_SUCCESS;
|
return LDB_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = ldb_set_opaque(ldb, "dsdb_use_global_schema", use_global_schema);
|
ret = ldb_set_opaque(ldb, "dsdb_use_global_schema", use_global_schema);
|
||||||
if (ret != LDB_SUCCESS) {
|
if (ret != LDB_SUCCESS) {
|
||||||
return ret;
|
return ret;
|
||||||
@ -468,6 +478,10 @@ struct dsdb_schema *dsdb_get_schema(struct ldb_context *ldb, TALLOC_CTX *referen
|
|||||||
struct dsdb_schema *schema_out;
|
struct dsdb_schema *schema_out;
|
||||||
struct dsdb_schema *schema_in;
|
struct dsdb_schema *schema_in;
|
||||||
bool use_global_schema;
|
bool use_global_schema;
|
||||||
|
TALLOC_CTX *tmp_ctx = talloc_new(reference_ctx);
|
||||||
|
if (!tmp_ctx) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
/* see if we have a cached copy */
|
/* see if we have a cached copy */
|
||||||
use_global_schema = (ldb_get_opaque(ldb, "dsdb_use_global_schema") != NULL);
|
use_global_schema = (ldb_get_opaque(ldb, "dsdb_use_global_schema") != NULL);
|
||||||
@ -478,24 +492,29 @@ struct dsdb_schema *dsdb_get_schema(struct ldb_context *ldb, TALLOC_CTX *referen
|
|||||||
|
|
||||||
schema_in = talloc_get_type(p, struct dsdb_schema);
|
schema_in = talloc_get_type(p, struct dsdb_schema);
|
||||||
if (!schema_in) {
|
if (!schema_in) {
|
||||||
|
talloc_free(tmp_ctx);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (schema_in->refresh_fn && !schema_in->refresh_in_progress) {
|
if (schema_in->refresh_fn && !schema_in->refresh_in_progress) {
|
||||||
|
if (!talloc_reference(tmp_ctx, schema_in)) {
|
||||||
|
/* ensure that the schema_in->refresh_in_progress remains valid for the right amount of time */
|
||||||
|
talloc_free(tmp_ctx);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
schema_in->refresh_in_progress = true;
|
schema_in->refresh_in_progress = true;
|
||||||
/* This may change schema, if it needs to reload it from disk */
|
/* This may change schema, if it needs to reload it from disk */
|
||||||
schema_out = schema_in->refresh_fn(schema_in->loaded_from_module,
|
schema_out = schema_in->refresh_fn(schema_in->loaded_from_module,
|
||||||
schema_in,
|
schema_in,
|
||||||
use_global_schema);
|
use_global_schema);
|
||||||
schema_in->refresh_in_progress = false;
|
schema_in->refresh_in_progress = false;
|
||||||
if (schema_out != schema_in) {
|
|
||||||
talloc_unlink(schema_in, ldb);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
schema_out = schema_in;
|
schema_out = schema_in;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* This removes the extra reference above */
|
||||||
|
talloc_free(tmp_ctx);
|
||||||
if (!reference_ctx) {
|
if (!reference_ctx) {
|
||||||
return schema_out;
|
return schema_out;
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user