s4:dsdb/schema: add "dsdb:schema update allowed" option to enable schema updates

[samba.git] / source4 / dsdb / schema / schema_set.c

diff --git a/source4/dsdb/schema/schema_set.c b/source4/dsdb/schema/schema_set.c
index 1c1e45ef78844bada9469f4181b5e9c7c606841e..4142842eee7b2b76274b880deb367855c1770e61 100644 (file)
--- a/source4/dsdb/schema/schema_set.c
+++ b/source4/dsdb/schema/schema_set.c
@@ -30,6 +30,11 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "lib/util/tsort.h"
 
+/* change this when we change something in our schema code that
+ * requires a re-index of the database
+ */
+#define SAMDB_INDEXING_VERSION "2"
+
 /*
   override the name to attribute handler function
  */
@@ -95,6 +100,12 @@ static int dsdb_schema_set_attributes(struct ldb_context *ldb, struct dsdb_schem
                goto op_error;
        }
 
+
+       ret = ldb_msg_add_string(msg_idx, "@IDXVERSION", SAMDB_INDEXING_VERSION);
+       if (ret != LDB_SUCCESS) {
+               goto op_error;
+       }
+
        for (attr = schema->attributes; attr; attr = attr->next) {
                const char *syntax = attr->syntax->ldb_syntax;
 
@@ -230,7 +241,8 @@ static void dsdb_setup_attribute_shortcuts(struct ldb_context *ldb, struct dsdb_
                        continue;
                }
                /* handle attributes with a linkID but no backlink */
-               if (dsdb_attribute_by_linkID(schema, attribute->linkID) == NULL) {
+               if ((attribute->linkID & 1) == 0 &&
+                   dsdb_attribute_by_linkID(schema, attribute->linkID + 1) == NULL) {
                        attribute->one_way_link = true;
                        continue;
                }
@@ -310,6 +322,7 @@ int dsdb_setup_sorted_accessors(struct ldb_context *ldb,
        struct dsdb_attribute *a;
        unsigned int i;
        unsigned int num_int_id;
+       int ret;
 
        /* free all caches */
        dsdb_sorted_accessors_free(schema);
@@ -394,6 +407,12 @@ int dsdb_setup_sorted_accessors(struct ldb_context *ldb,
 
        dsdb_setup_attribute_shortcuts(ldb, schema);
 
+       ret = schema_fill_constructed(schema);
+       if (ret != LDB_SUCCESS) {
+               dsdb_sorted_accessors_free(schema);
+               return ret;
+       }
+
        return LDB_SUCCESS;
 
 failed:
@@ -401,24 +420,6 @@ failed:
        return ldb_oom(ldb);
 }
 
-int dsdb_setup_schema_inversion(struct ldb_context *ldb, struct dsdb_schema *schema)
-{
-       /* Walk the list of schema classes */
-
-       /*  For each subClassOf, add us to subclasses of the parent */
-
-       /* collect these subclasses into a recursive list of total subclasses, preserving order */
-
-       /* For each subclass under 'top', write the index from it's
-        * order as an integer in the dsdb_class (for sorting
-        * objectClass lists efficiently) */
-
-       /* Walk the list of schema classes */
-
-       /*  Create a 'total possible superiors' on each class */
-       return LDB_SUCCESS;
-}
-
 /**
  * Attach the schema to an opaque pointer on the ldb,
  * so ldb modules can find it
@@ -433,11 +434,6 @@ int dsdb_set_schema(struct ldb_context *ldb, struct dsdb_schema *schema)
                return ret;
        }
 
-       ret = schema_fill_constructed(schema);
-       if (ret != LDB_SUCCESS) {
-               return ret;
-       }
-
        old_schema = ldb_get_opaque(ldb, "dsdb_schema");
 
        ret = ldb_set_opaque(ldb, "dsdb_schema", schema);
@@ -687,7 +683,9 @@ WERROR dsdb_schema_set_el_from_ldb_msg(struct ldb_context *ldb, struct dsdb_sche
  * schema itself to the directory.
  */
 
-WERROR dsdb_set_schema_from_ldif(struct ldb_context *ldb, const char *pf, const char *df)
+WERROR dsdb_set_schema_from_ldif(struct ldb_context *ldb,
+                                const char *pf, const char *df,
+                                const char *dn)
 {
        struct ldb_ldif *ldif;
        struct ldb_message *msg;
@@ -706,9 +704,16 @@ WERROR dsdb_set_schema_from_ldif(struct ldb_context *ldb, const char *pf, const
        }
 
        schema = dsdb_new_schema(mem_ctx);
-
+       if (!schema) {
+               goto nomem;
+       }
+       schema->base_dn = ldb_dn_new(schema, ldb, dn);
+       if (!schema->base_dn) {
+               goto nomem;
+       }
        schema->fsmo.we_are_master = true;
-       schema->fsmo.master_dn = ldb_dn_new_fmt(schema, ldb, "@PROVISION_SCHEMA_MASTER");
+       schema->fsmo.update_allowed = true;
+       schema->fsmo.master_dn = ldb_dn_new(schema, ldb, "@PROVISION_SCHEMA_MASTER");
        if (!schema->fsmo.master_dn) {
                goto nomem;
        }