s4-dsdb_syntax: *_OID_oid_ldb_to_drsuapi() functions should use
authorKamen Mazdrashki <kamenim@samba.org>
Tue, 26 Oct 2010 19:14:43 +0000 (22:14 +0300)
committerKamen Mazdrashki <kamenim@samba.org>
Tue, 26 Oct 2010 22:44:36 +0000 (22:44 +0000)
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

source4/dsdb/schema/schema_syntax.c

index 2f68ea2f495a918bdaa160a621894948bc2659f4..4267cd716f152cbf37597c980d8aae6a146b5af6 100644 (file)
@@ -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);