Changeset 745 for trunk/server/source4/dsdb/schema/schema.h

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/dsdb/schema/schema.h (modified) (10 diffs)

trunk/server/source4/dsdb/schema/schema.h

@@ -23 +23 @@
 #define _DSDB_SCHEMA_H
 
+#include "prefixmap.h"
+
 struct dsdb_attribute;
 struct dsdb_class;
 struct dsdb_schema;
+struct dsdb_dn;
+
+struct dsdb_syntax_ctx {
+        struct ldb_context *ldb;
+        const struct dsdb_schema *schema;
+
+        /* set when converting objects under Schema NC */
+        bool is_schema_nc;
+
+        /* remote prefixMap to be used for drsuapi_to_ldb conversions */
+        const struct dsdb_schema_prefixmap *pfm_remote;
+};
+
 
 struct dsdb_syntax {
@@ -38 +53 @@
         const char *ldb_syntax;
 
-        WERROR (*drsuapi_to_ldb)(struct ldb_context *ldb, 
-                                 const struct dsdb_schema *schema,
+        WERROR (*drsuapi_to_ldb)(const struct dsdb_syntax_ctx *ctx,
                                  const struct dsdb_attribute *attr,
                                  const struct drsuapi_DsReplicaAttribute *in,
                                  TALLOC_CTX *mem_ctx,
                                  struct ldb_message_element *out);
-        WERROR (*ldb_to_drsuapi)(struct ldb_context *ldb, 
-                                 const struct dsdb_schema *schema,
+        WERROR (*ldb_to_drsuapi)(const struct dsdb_syntax_ctx *ctx,
                                  const struct dsdb_attribute *attr,
                                  const struct ldb_message_element *in,
                                  TALLOC_CTX *mem_ctx,
                                  struct drsuapi_DsReplicaAttribute *out);
+        WERROR (*validate_ldb)(const struct dsdb_syntax_ctx *ctx,
+                               const struct dsdb_attribute *attr,
+                               const struct ldb_message_element *in);
 };
 
@@ -61 +77 @@
         struct GUID schemaIDGUID;
         uint32_t mAPIID;
+        uint32_t msDS_IntId;
 
         struct GUID attributeSecurityGUID;
+        struct GUID objectGUID;
 
         uint32_t searchFlags;
@@ -103 +121 @@
         uint32_t governsID_id;
         struct GUID schemaIDGUID;
+        struct GUID objectGUID;
 
         uint32_t objectClassCategory;
@@ -120 +139 @@
         const char **mayContain;
         const char **possibleInferiors;
+        const char **systemPossibleInferiors;
 
         const char *defaultSecurityDescriptor;
@@ -134 +154 @@
         bool systemOnly;
 
-        char **supclasses;
-        char **subclasses;
-        char **subclasses_direct;
-        char **posssuperiors;
+        const char **supclasses;
+        const char **subclasses;
+        const char **subclasses_direct;
+        const char **posssuperiors;
         uint32_t subClassOf_id;
         uint32_t *systemAuxiliaryClass_ids;
@@ -156 +176 @@
 };
 
-struct dsdb_schema_oid_prefix {
-        uint32_t id;
-        const char *oid;
-        size_t oid_len;
-};
+/**
+ * data stored in schemaInfo attribute
+ */
+struct dsdb_schema_info {
+        uint32_t        revision;
+        struct GUID     invocation_id;
+};
+
 
 struct dsdb_schema {
-        uint32_t num_prefixes;
-        struct dsdb_schema_oid_prefix *prefixes;
+        struct ldb_dn *base_dn;
+
+        struct dsdb_schema_prefixmap *prefixmap;
 
         /* 
@@ -176 +200 @@
         const char *schema_info;
 
+        /* We can also tell the schema version from the USN on the partition */
+        uint64_t loaded_usn;
+
         struct dsdb_attribute *attributes;
         struct dsdb_class *classes;
@@ -193 +220 @@
         struct dsdb_attribute **attributes_by_attributeID_oid;
         struct dsdb_attribute **attributes_by_linkID;
+        uint32_t num_int_id_attr;
+        struct dsdb_attribute **attributes_by_msDS_IntId;
 
         struct {
@@ -199 +228 @@
         } fsmo;
 
-        struct smb_iconv_convenience *iconv_convenience;
+        /* Was this schema loaded from ldb (if so, then we will reload it when we detect a change in ldb) */
+        struct ldb_module *loaded_from_module;
+        struct dsdb_schema *(*refresh_fn)(struct ldb_module *module, struct dsdb_schema *schema, bool is_global_schema);
+        bool refresh_in_progress;
+        /* an 'opaque' sequence number that the reload function may also wish to use */
+        uint64_t reload_seq_number;
+
+        /* Should the syntax handlers in this case handle all incoming OIDs automatically, assigning them as an OID if no text name is known? */
+        bool relax_OID_conversions;
 };