s4/drs: dsdb_load_oid_mappings_drsuapi() -> dsdb_load_prefixmap_from_drsuapi()

Also, dsdb_load_oid_mappings_drsuapi() was reimplemented to use
dsdb_schema_pfm_from_drsuapi_pfm() function to load
drsuapi_prefixMap into schema->prefixmap

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c
index f8b7d5dd4431cea5cc5902905c86de72f0dbe025..dc4f1fffece26976c65405a42a8100382e6e9062 100644 (file)
--- a/source4/dsdb/schema/schema_init.c
+++ b/source4/dsdb/schema/schema_init.c
@@ -45,62 +45,23 @@ struct dsdb_schema *dsdb_new_schema(TALLOC_CTX *mem_ctx, struct smb_iconv_conven
 }
 
 
-WERROR dsdb_load_oid_mappings_drsuapi(struct dsdb_schema *schema, const struct drsuapi_DsReplicaOIDMapping_Ctr *ctr)
+WERROR dsdb_load_prefixmap_from_drsuapi(struct dsdb_schema *schema,
+                                       const struct drsuapi_DsReplicaOIDMapping_Ctr *ctr)
 {
-       uint32_t i,j;
-
-       schema->prefixes = talloc_array(schema, struct dsdb_schema_oid_prefix, ctr->num_mappings);
-       W_ERROR_HAVE_NO_MEMORY(schema->prefixes);
-
-       for (i=0, j=0; i < ctr->num_mappings; i++) {
-               if (ctr->mappings[i].oid.binary_oid == NULL) {
-                       return WERR_INVALID_PARAM;
-               }
-
-               if (ctr->mappings[i].oid.binary_oid[0] == 0xFF) {
-                       if (ctr->mappings[i].id_prefix != 0) {
-                               return WERR_INVALID_PARAM;
-                       }
-
-                       /* the magic value should be in the last array member */
-                       if (i != (ctr->num_mappings - 1)) {
-                               return WERR_INVALID_PARAM;
-                       }
+       WERROR werr;
+       const char *schema_info;
+       struct dsdb_schema_prefixmap *pfm;
 
-                       if (ctr->mappings[i].oid.length != 21) {
-                               return WERR_INVALID_PARAM;
-                       }
+       werr = dsdb_schema_pfm_from_drsuapi_pfm(ctr, schema, &pfm, &schema_info);
+       W_ERROR_NOT_OK_RETURN(werr);
 
-                       schema->schema_info = hex_encode_talloc(schema,
-                                                               ctr->mappings[i].oid.binary_oid,
-                                                               ctr->mappings[i].oid.length);
-                       W_ERROR_HAVE_NO_MEMORY(schema->schema_info);
-               } else {
-                       DATA_BLOB oid_blob;
-                       const char *partial_oid = NULL;
+       /* set loaded prefixMap */
+       talloc_free(schema->prefixmap);
+       schema->prefixmap = pfm;
 
-                       /* the last array member should contain the magic value not a oid */
-                       if (i == (ctr->num_mappings - 1)) {
-                               return WERR_INVALID_PARAM;
-                       }
-
-                       oid_blob = data_blob_const(ctr->mappings[i].oid.binary_oid,
-                                                  ctr->mappings[i].oid.length);
-                       if (!ber_read_partial_OID_String(schema->prefixes, oid_blob, &partial_oid)) {
-                               DEBUG(0, ("ber_read_partial_OID failed on prefixMap item with id: 0x%X",
-                                         ctr->mappings[i].id_prefix));
-                               return WERR_INVALID_PARAM;
-                       }
-
-                       schema->prefixes[j].id  = ctr->mappings[i].id_prefix<<16;
-                       schema->prefixes[j].oid = partial_oid;
-                       W_ERROR_HAVE_NO_MEMORY(schema->prefixes[j].oid);
-                       schema->prefixes[j].oid_len = strlen(schema->prefixes[j].oid);
-                       j++;
-               }
-       }
+       talloc_free(discard_const(schema->schema_info));
+       schema->schema_info = schema_info;
 
-       schema->num_prefixes = j;
        return WERR_OK;
 }
 
@@ -148,7 +109,7 @@ WERROR dsdb_load_oid_mappings_ldb(struct dsdb_schema *schema,
        pfm.ctr.dsdb.mappings[pfm.ctr.dsdb.num_mappings - 1].oid.binary_oid     = schema_info_blob.data;
 
        /* call the drsuapi version */
-       status = dsdb_load_oid_mappings_drsuapi(schema, &pfm.ctr.dsdb);
+       status = dsdb_load_prefixmap_from_drsuapi(schema, &pfm.ctr.dsdb);
        talloc_free(mem_ctx);
 
        W_ERROR_NOT_OK_RETURN(status);

diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index b7b49d8ba5316bf89082207474f902be5c831d68..2c5aae024e458f96c7430e300fb413b3fba863d0 100644 (file)
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -419,7 +419,7 @@ static NTSTATUS vampire_schema_chunk(void *private_data,
 
                NT_STATUS_HAVE_NO_MEMORY(s->self_made_schema);
 
-               status = dsdb_load_oid_mappings_drsuapi(s->self_made_schema, mapping_ctr);
+               status = dsdb_load_prefixmap_from_drsuapi(s->self_made_schema, mapping_ctr);
                if (!W_ERROR_IS_OK(status)) {
                        return werror_to_ntstatus(status);
                }

diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c
index 204b824779d4dbd0b330c60b5f4ee9df032fe91d..fbdcd06cbf6c832d8b110766c8e2f6a548911ed5 100644 (file)
--- a/source4/torture/libnet/libnet_BecomeDC.c
+++ b/source4/torture/libnet/libnet_BecomeDC.c
@@ -393,7 +393,7 @@ static NTSTATUS test_become_dc_schema_chunk(void *private_data,
 
                NT_STATUS_HAVE_NO_MEMORY(s->self_made_schema);
 
-               status = dsdb_load_oid_mappings_drsuapi(s->self_made_schema, mapping_ctr);
+               status = dsdb_load_prefixmap_from_drsuapi(s->self_made_schema, mapping_ctr);
                if (!W_ERROR_IS_OK(status)) {
                        return werror_to_ntstatus(status);
                }