diff options
| author | Kamen Mazdrashki <kamenim@samba.org> | 2010-11-09 04:12:57 +0200 |
|---|---|---|
| committer | Kamen Mazdrashki <kamenim@samba.org> | 2010-11-11 18:54:20 +0000 |
| commit | e772518a64f1f616ba6c00a8ee45cffd228bd8b3 (patch) | |
| tree | 95ec47e94eac55ae61d3f6746e9614b28cb5c4ac | |
| parent | f65c8402998c0759aac1ff27234a5e841a3bba37 (diff) | |
| download | samba-e772518a64f1f616ba6c00a8ee45cffd228bd8b3.tar.gz samba-e772518a64f1f616ba6c00a8ee45cffd228bd8b3.tar.bz2 samba-e772518a64f1f616ba6c00a8ee45cffd228bd8b3.zip | |
s4-dsdb_syntax: Use remote prefixMap to handle generic cases in drsuapi_to_ldb conversions
| -rw-r--r-- | source4/dsdb/schema/schema_syntax.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c index 7d0bf597ce..544fd3280f 100644 --- a/source4/dsdb/schema/schema_syntax.c +++ b/source4/dsdb/schema/schema_syntax.c @@ -904,7 +904,9 @@ static WERROR _dsdb_syntax_auto_OID_drsuapi_to_ldb(const struct dsdb_syntax_ctx str = talloc_strdup(out->values, a->lDAPDisplayName); } else { WERROR werr; - werr = dsdb_schema_pfm_oid_from_attid(ctx->schema->prefixmap, v, out->values, &str); + SMB_ASSERT(ctx->pfm_remote); + werr = dsdb_schema_pfm_oid_from_attid(ctx->pfm_remote, v, + out->values, &str); W_ERROR_NOT_OK_RETURN(werr); } W_ERROR_HAVE_NO_MEMORY(str); @@ -1016,6 +1018,8 @@ static WERROR _dsdb_syntax_OID_oid_drsuapi_to_ldb(const struct dsdb_syntax_ctx * { unsigned int i; + SMB_ASSERT(ctx->pfm_remote); + out->flags = 0; out->name = talloc_strdup(mem_ctx, attr->lDAPDisplayName); W_ERROR_HAVE_NO_MEMORY(out->name); @@ -1039,7 +1043,8 @@ static WERROR _dsdb_syntax_OID_oid_drsuapi_to_ldb(const struct dsdb_syntax_ctx * attid = IVAL(in->value_ctr.values[i].blob->data, 0); - status = dsdb_schema_pfm_oid_from_attid(ctx->schema->prefixmap, attid, out->values, &oid); + status = dsdb_schema_pfm_oid_from_attid(ctx->pfm_remote, attid, + out->values, &oid); W_ERROR_NOT_OK_RETURN(status); out->values[i] = data_blob_string_const(oid); |