Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local

[kai/samba.git] / source4 / dsdb / samdb / samdb.h

diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h
index dc604cce78bce93f21a9ece76b1748cd5f3844cd..8370857aba325f5d87ceaa37718a0331ccf69265 100644 (file)
--- a/source4/dsdb/samdb/samdb.h
+++ b/source4/dsdb/samdb/samdb.h
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,44 +16,83 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __SAMDB_H__
 #define __SAMDB_H__
 
 struct auth_session_info;
-struct drsuapi_DsNameInfo1;
-struct drsuapi_DsReplicaObject;
-struct drsuapi_DsReplicaOIDMapping_Ctr;
-struct drsuapi_DsReplicaAttribute;
-struct drsuapi_DsGetNCChangesCtr1;
-struct drsuapi_DsGetNCChangesCtr6;
-struct ldb_dn;
-struct ldb_message;
-
-#define DSDB_CONTROL_REPLICATED_OBJECT_OID "1.3.6.1.4.1.7165.4.3.1"
-struct dsdb_control_replicated_object {
-       uint8_t __dummy;
+struct dsdb_control_current_partition;
+struct dsdb_extended_replicated_object;
+struct dsdb_extended_replicated_objects;
+struct loadparm_context;
+struct event_context;
+
+#include "librpc/gen_ndr/security.h"
+#include "lib/ldb/include/ldb.h"
+#include "librpc/gen_ndr/samr.h"
+#include "librpc/gen_ndr/drsuapi.h"
+#include "librpc/gen_ndr/drsblobs.h"
+#include "dsdb/schema/schema.h"
+#include "dsdb/samdb/samdb_proto.h"
+#include "dsdb/common/proto.h"
+#include "dsdb/common/flags.h"
+
+#define DSDB_CONTROL_CURRENT_PARTITION_OID "1.3.6.1.4.1.7165.4.3.2"
+struct dsdb_control_current_partition {
+       /* 
+        * this is the version of the dsdb_control_current_partition
+        * version 0: initial implementation
+        */
+#define DSDB_CONTROL_CURRENT_PARTITION_VERSION 0
+       uint32_t version;
+
+       struct ldb_dn *dn;
+
+       const char *backend;
+
+       struct ldb_module *module;
 };
 
 #define DSDB_EXTENDED_REPLICATED_OBJECTS_OID "1.3.6.1.4.1.7165.4.4.1"
 struct dsdb_extended_replicated_object {
        struct ldb_message *msg;
+       struct ldb_val guid_value;
+       const char *when_changed;
+       struct replPropertyMetaDataBlob *meta_data;
 };
 
 struct dsdb_extended_replicated_objects {
+       /* 
+        * this is the version of the dsdb_extended_replicated_objects
+        * version 0: initial implementation
+        */
+#define DSDB_EXTENDED_REPLICATED_OBJECTS_VERSION 0
+       uint32_t version;
+
        struct ldb_dn *partition_dn;
 
+       const struct repsFromTo1 *source_dsa;
+       const struct drsuapi_DsReplicaCursor2CtrEx *uptodateness_vector;
+
        uint32_t num_objects;
        struct dsdb_extended_replicated_object *objects;
 };
 
-#include "librpc/gen_ndr/security.h"
-#include "lib/ldb/include/ldb.h"
-#include "librpc/gen_ndr/samr.h"
-#include "dsdb/schema/schema.h"
-#include "dsdb/samdb/samdb_proto.h"
+struct dsdb_schema_fsmo {
+       bool we_are_master;
+       struct ldb_dn *master_dn;
+};
+
+struct dsdb_naming_fsmo {
+       bool we_are_master;
+       struct ldb_dn *master_dn;
+};
+
+struct dsdb_pdc_fsmo {
+       bool we_are_master;
+       struct ldb_dn *master_dn;
+};
 
 #endif /* __SAMDB_H__ */