sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s4-dsdb_syntax: Use remote prefixMap to handle generic cases in drsuapi_to_ldb conversions

Browse Source
This commit is contained in:
Kamen Mazdrashki 2010-11-09 04:12:57 +02:00
parent f65c840299
commit e772518a64
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source4/dsdb/schema/schema_syntax.c
View File

@ -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); str = talloc_strdup(out->values, a->lDAPDisplayName);
} else { } else {
WERROR werr; 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_NOT_OK_RETURN(werr);
} }
W_ERROR_HAVE_NO_MEMORY(str); 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; unsigned int i;
SMB_ASSERT(ctx->pfm_remote);
out->flags = 0; out->flags = 0;
out->name = talloc_strdup(mem_ctx, attr->lDAPDisplayName); out->name = talloc_strdup(mem_ctx, attr->lDAPDisplayName);
W_ERROR_HAVE_NO_MEMORY(out->name); 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); 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); W_ERROR_NOT_OK_RETURN(status);
out->values[i] = data_blob_string_const(oid); out->values[i] = data_blob_string_const(oid);