From f7902d766a0866d92e728449377a406f8e202b2a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 11 Aug 2011 15:43:22 +1000 Subject: s4-dsdb: remove the naming_fsmo and pdc_fsmo modules these are not needed now that the rootdse modules calculates the validFSMOs attribute at runtime Pair-Programmed-With: Andrew Bartlett --- source4/dsdb/samdb/ldb_modules/samba_dsdb.c | 12 ------------ source4/dsdb/samdb/ldb_modules/wscript_build | 20 -------------------- source4/dsdb/samdb/samdb.h | 10 ---------- 3 files changed, 42 deletions(-) (limited to 'source4/dsdb/samdb') diff --git a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c index e4de1524be..c7c4fe377c 100644 --- a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c +++ b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c @@ -301,18 +301,6 @@ static int samba_dsdb_init(struct ldb_module *module) partition_msg = ldb_msg_new(tmp_ctx); partition_msg->dn = ldb_dn_new(partition_msg, ldb, "@" DSDB_OPAQUE_PARTITION_MODULE_MSG_OPAQUE_NAME); - ret = prepare_modules_line(ldb, tmp_ctx, - rootdse_msg, - partition_msg, "defaultNamingContext", - "pdc_fsmo", backend_modules); - CHECK_LDB_RET(ret); - - ret = prepare_modules_line(ldb, tmp_ctx, - rootdse_msg, - partition_msg, "configurationNamingContext", - "naming_fsmo", backend_modules); - CHECK_LDB_RET(ret); - ret = prepare_modules_line(ldb, tmp_ctx, rootdse_msg, partition_msg, "schemaNamingContext", diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build index 857237170f..3212039ff9 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -84,26 +84,6 @@ bld.SAMBA_MODULE('ldb_schema_data', ) -bld.SAMBA_MODULE('ldb_naming_fsmo', - source='naming_fsmo.c', - subsystem='ldb', - init_function='ldb_naming_fsmo_module_init', - module_init_name='ldb_init_module', - internal_module=False, - deps='samdb talloc DSDB_MODULE_HELPERS' - ) - - -bld.SAMBA_MODULE('ldb_pdc_fsmo', - source='pdc_fsmo.c', - subsystem='ldb', - init_function='ldb_pdc_fsmo_module_init', - module_init_name='ldb_init_module', - internal_module=False, - deps='samdb talloc DSDB_MODULE_HELPERS' - ) - - bld.SAMBA_MODULE('ldb_samldb', source='samldb.c', subsystem='ldb', diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h index 96f44c356e..8fb7b644ad 100644 --- a/source4/dsdb/samdb/samdb.h +++ b/source4/dsdb/samdb/samdb.h @@ -131,16 +131,6 @@ struct dsdb_extended_replicated_objects { const struct drsuapi_DsReplicaLinkedAttribute *linked_attributes; }; -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; -}; - #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; -- cgit