diff options
-rw-r--r-- | source4/dsdb/repl/drepl_fsmo.c | 5 | ||||
-rw-r--r-- | source4/dsdb/repl/drepl_service.h | 2 | ||||
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/rootdse.c | 2 | ||||
-rw-r--r-- | source4/librpc/idl/irpc.idl | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/source4/dsdb/repl/drepl_fsmo.c b/source4/dsdb/repl/drepl_fsmo.c index ad655f77b9..98bc1c1b7a 100644 --- a/source4/dsdb/repl/drepl_fsmo.c +++ b/source4/dsdb/repl/drepl_fsmo.c @@ -30,8 +30,7 @@ #include "smbd/service.h" #include "dsdb/repl/drepl_service.h" #include "param/param.h" -#include "lib/messaging/irpc.h" -#include "librpc/gen_ndr/ndr_irpc.h" +#include "librpc/gen_ndr/irpc.h" static void drepl_role_callback(struct dreplsrv_service *service, WERROR werr, @@ -59,7 +58,7 @@ static bool fsmo_master_cmp(struct ldb_dn *ntds_dn, struct ldb_dn *role_owner_dn see which role is we are asked to assume, initialize data and send request */ WERROR dreplsrv_fsmo_role_check(struct dreplsrv_service *service, - uint32_t role) + enum drepl_role_master role) { struct ldb_dn *role_owner_dn, *fsmo_role_dn, *ntds_dn; TALLOC_CTX *tmp_ctx = talloc_new(service); diff --git a/source4/dsdb/repl/drepl_service.h b/source4/dsdb/repl/drepl_service.h index 48b084f45b..ffff0bf08b 100644 --- a/source4/dsdb/repl/drepl_service.h +++ b/source4/dsdb/repl/drepl_service.h @@ -233,6 +233,8 @@ struct dreplsrv_service { bool am_rodc; }; +enum drepl_role_master; + #include "dsdb/repl/drepl_out_helpers.h" #include "dsdb/repl/drepl_service_proto.h" diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c index 5eac74f0f1..e7ea7651e0 100644 --- a/source4/dsdb/samdb/ldb_modules/rootdse.c +++ b/source4/dsdb/samdb/ldb_modules/rootdse.c @@ -1154,7 +1154,7 @@ static int rootdse_add(struct ldb_module *module, struct ldb_request *req) static int rootdse_become_master(struct ldb_module *module, struct ldb_request *req, - uint32_t role) + enum drepl_role_master role) { struct drepl_takeFSMORole r; struct messaging_context *msg; diff --git a/source4/librpc/idl/irpc.idl b/source4/librpc/idl/irpc.idl index 334c102804..ed331c7fdb 100644 --- a/source4/librpc/idl/irpc.idl +++ b/source4/librpc/idl/irpc.idl @@ -176,7 +176,7 @@ import "misc.idl", "security.idl", "nbt.idl", "netlogon.idl"; } drepl_role_master; WERROR drepl_takeFSMORole( - [in] uint32 role + [in] drepl_role_master role ); /* |