From: Andrew Bartlett Date: Fri, 14 Dec 2018 01:49:03 +0000 (+1300) Subject: dsdb: sort DSDB_EXTENDED defines by OID X-Git-Tag: tdb-1.3.17~279 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cff50febecfb3c0443a17da29a047eea2e09e61;p=thirdparty%2Fsamba.git dsdb: sort DSDB_EXTENDED defines by OID This helps avoid duplicate values and clearly indicates what value to select next. Signed-off-by: Andrew Bartlett Reviewed-by: Gary Lockyer Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Mon Dec 17 04:30:39 CET 2018 on sn-devel-144 --- diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h index 0835ff660cd..fd8d4e4497e 100644 --- a/source4/dsdb/samdb/samdb.h +++ b/source4/dsdb/samdb/samdb.h @@ -234,6 +234,12 @@ struct dsdb_extended_replicated_object { struct ldb_dn *local_parent_dn; }; +/* + * the schema_dn is passed as struct ldb_dn in + * req->op.extended.data + */ +#define DSDB_EXTENDED_SCHEMA_UPDATE_NOW_OID "1.3.6.1.4.1.7165.4.4.2" + struct dsdb_extended_replicated_objects { /* * this is the version of the dsdb_extended_replicated_objects @@ -261,20 +267,46 @@ struct dsdb_extended_replicated_objects { bool originating_updates; }; +/* In ldb.h: LDB_EXTENDED_SEQUENCE_NUMBER 1.3.6.1.4.1.7165.4.4.3 */ + #define DSDB_EXTENDED_CREATE_PARTITION_OID "1.3.6.1.4.1.7165.4.4.4" struct dsdb_create_partition_exop { struct ldb_dn *new_dn; }; +/* this takes a struct dsdb_fsmo_extended_op */ +#define DSDB_EXTENDED_ALLOCATE_RID_POOL "1.3.6.1.4.1.7165.4.4.5" + +struct dsdb_fsmo_extended_op { + uint64_t fsmo_info; + struct GUID destination_dsa_guid; +}; + +#define DSDB_EXTENDED_SCHEMA_UPGRADE_IN_PROGRESS_OID "1.3.6.1.4.1.7165.4.4.6" + /* - * the schema_dn is passed as struct ldb_dn in - * req->op.extended.data + * passed from the descriptor module in order to + * store the recalucated nTSecurityDescriptor without + * modifying the replPropertyMetaData. */ -#define DSDB_EXTENDED_SCHEMA_UPDATE_NOW_OID "1.3.6.1.4.1.7165.4.4.2" +#define DSDB_EXTENDED_SEC_DESC_PROPAGATION_OID "1.3.6.1.4.1.7165.4.4.7" +struct dsdb_extended_sec_desc_propagation_op { + struct ldb_dn *nc_root; + struct ldb_dn *dn; + bool include_self; +}; -#define DSDB_EXTENDED_SCHEMA_LOAD "1.3.6.1.4.1.7165.4.4.10" +/* this takes no data */ +#define DSDB_EXTENDED_CREATE_OWN_RID_SET "1.3.6.1.4.1.7165.4.4.8" -#define DSDB_EXTENDED_SCHEMA_UPGRADE_IN_PROGRESS_OID "1.3.6.1.4.1.7165.4.4.6" +/* this takes a struct dsdb_extended_allocate_rid */ +#define DSDB_EXTENDED_ALLOCATE_RID "1.3.6.1.4.1.7165.4.4.9" + +struct dsdb_extended_allocate_rid { + uint32_t rid; +}; + +#define DSDB_EXTENDED_SCHEMA_LOAD "1.3.6.1.4.1.7165.4.4.10" #define DSDB_OPENLDAP_DEREFERENCE_CONTROL "1.3.6.1.4.1.4203.666.5.16" @@ -314,36 +346,6 @@ struct dsdb_extended_dn_store_format { #define DSDB_OPAQUE_PARTITION_MODULE_MSG_OPAQUE_NAME "DSDB_OPAQUE_PARTITION_MODULE_MSG" -/* this takes a struct dsdb_fsmo_extended_op */ -#define DSDB_EXTENDED_ALLOCATE_RID_POOL "1.3.6.1.4.1.7165.4.4.5" - -struct dsdb_fsmo_extended_op { - uint64_t fsmo_info; - struct GUID destination_dsa_guid; -}; - -/* this takes no data */ -#define DSDB_EXTENDED_CREATE_OWN_RID_SET "1.3.6.1.4.1.7165.4.4.8" - -/* this takes a struct dsdb_extended_allocate_rid */ -#define DSDB_EXTENDED_ALLOCATE_RID "1.3.6.1.4.1.7165.4.4.9" - -struct dsdb_extended_allocate_rid { - uint32_t rid; -}; - -/* - * passed from the descriptor module in order to - * store the recalucated nTSecurityDescriptor without - * modifying the replPropertyMetaData. - */ -#define DSDB_EXTENDED_SEC_DESC_PROPAGATION_OID "1.3.6.1.4.1.7165.4.4.7" -struct dsdb_extended_sec_desc_propagation_op { - struct ldb_dn *nc_root; - struct ldb_dn *dn; - bool include_self; -}; - #define DSDB_ACL_CHECKS_DIRSYNC_FLAG 0x1 #define DSDB_SAMDB_MINIMUM_ALLOWED_RID 1000