diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-03-16 14:52:39 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-03-16 19:26:03 +1100 |
| commit | 2de07761e071ccf09c0ea9e0fdc6a61303356549 (patch) | |
| tree | 8d95f00365a32c81e001768fc2aa0aa8c866accb /source4/dsdb/kcc/kcc_drs_replica_info.c | |
| parent | bf0b4d7ee3f52f77d706ccea12abb2f033b4abd9 (diff) | |
| download | samba-2de07761e071ccf09c0ea9e0fdc6a61303356549.tar.gz samba-2de07761e071ccf09c0ea9e0fdc6a61303356549.tar.bz2 samba-2de07761e071ccf09c0ea9e0fdc6a61303356549.zip | |
s4:dsdb Change dsdb_get_schema() callers to use new talloc argument
This choses an appropriate talloc context to attach the schema too,
long enough lived to ensure it does not go away before the operation
compleates.
Andrew Bartlett
Diffstat (limited to 'source4/dsdb/kcc/kcc_drs_replica_info.c')
| -rw-r--r-- | source4/dsdb/kcc/kcc_drs_replica_info.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source4/dsdb/kcc/kcc_drs_replica_info.c b/source4/dsdb/kcc/kcc_drs_replica_info.c index c64753b796..322ccc980c 100644 --- a/source4/dsdb/kcc/kcc_drs_replica_info.c +++ b/source4/dsdb/kcc/kcc_drs_replica_info.c @@ -181,6 +181,8 @@ static WERROR kccdrs_replica_get_info_obj_metadata2(TALLOC_CTX *mem_ctx, struct replPropertyMetaDataBlob omd_ctr; struct replPropertyMetaData1 *attr; struct drsuapi_DsReplicaObjMetaData2Ctr *metadata2; + const struct dsdb_schema *schema; + uint32_t i, j; DEBUG(0, ("kccdrs_replica_get_info_obj_metadata2() called\n")); @@ -196,6 +198,12 @@ static WERROR kccdrs_replica_get_info_obj_metadata2(TALLOC_CTX *mem_ctx, status = get_repl_prop_metadata_ctr(mem_ctx, samdb, dn, &omd_ctr); W_ERROR_NOT_OK_RETURN(status); + schema = dsdb_get_schema(samdb, reply); + if (!schema) { + DEBUG(0,(__location__": Failed to get the schema\n")); + return WERR_INTERNAL_ERROR; + } + reply->objmetadata2 = talloc_zero(mem_ctx, struct drsuapi_DsReplicaObjMetaData2Ctr); W_ERROR_HAVE_NO_MEMORY(reply->objmetadata2); metadata2 = reply->objmetadata2; @@ -215,7 +223,7 @@ static WERROR kccdrs_replica_get_info_obj_metadata2(TALLOC_CTX *mem_ctx, /* get a reference to the attribute on 'omd_ctr' */ attr = &omd_ctr.ctr.ctr1.array[j]; - schema_attr = dsdb_attribute_by_attributeID_id(dsdb_get_schema(samdb), attr->attid); + schema_attr = dsdb_attribute_by_attributeID_id(schema, attr->attid); DEBUG(0, ("attribute_id = %d, attribute_name: %s\n", attr->attid, schema_attr->lDAPDisplayName)); |