summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamenim@samba.org>2010-10-26 22:14:43 +0300
committerKamen Mazdrashki <kamenim@samba.org>2010-10-26 22:44:36 +0000
commite5ebc486975cc172d9547b34151204c58f0d14c2 (patch)
treef5a6ebd6a953f4547108500f7e303df008985552
parent6a6c7c9aa2a8a04d6c1b6c6c8c5841efa4cb8e09 (diff)
downloadsamba-e5ebc486975cc172d9547b34151204c58f0d14c2.tar.gz
samba-e5ebc486975cc172d9547b34151204c58f0d14c2.tar.bz2
samba-e5ebc486975cc172d9547b34151204c58f0d14c2.zip
s4-dsdb_syntax: *_OID_oid_ldb_to_drsuapi() functions should use
dsdb_schema_pfm_attid_from_oid() instead of dsdb_schema_pfm_make_attid() as those functions are supposed to return ATTIDs only for OIDs we already know about (i.e. are in prefixMap) Autobuild-User: Kamen Mazdrashki <kamenim@samba.org> Autobuild-Date: Tue Oct 26 22:44:36 UTC 2010 on sn-devel-104
-rw-r--r--source4/dsdb/schema/schema_syntax.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c
index 2f68ea2f49..4267cd716f 100644
--- a/source4/dsdb/schema/schema_syntax.c
+++ b/source4/dsdb/schema/schema_syntax.c
@@ -1087,9 +1087,9 @@ static WERROR _dsdb_syntax_auto_OID_ldb_to_drsuapi(const struct dsdb_syntax_ctx
} else {
uint32_t attid;
WERROR werr;
- werr = dsdb_schema_pfm_make_attid(ctx->schema->prefixmap,
- (const char *)v->data,
- &attid);
+ werr = dsdb_schema_pfm_attid_from_oid(ctx->schema->prefixmap,
+ (const char *)v->data,
+ &attid);
W_ERROR_NOT_OK_RETURN(werr);
SIVAL(blobs[i].data, 0, attid);
}
@@ -1210,9 +1210,9 @@ static WERROR _dsdb_syntax_OID_oid_ldb_to_drsuapi(const struct dsdb_syntax_ctx *
blobs[i] = data_blob_talloc(blobs, NULL, 4);
W_ERROR_HAVE_NO_MEMORY(blobs[i].data);
- status = dsdb_schema_pfm_make_attid(ctx->schema->prefixmap,
- (const char *)in->values[i].data,
- &attid);
+ status = dsdb_schema_pfm_attid_from_oid(ctx->schema->prefixmap,
+ (const char *)in->values[i].data,
+ &attid);
W_ERROR_NOT_OK_RETURN(status);
SIVAL(blobs[i].data, 0, attid);