lib/util: consolidate module loading into common code

[samba.git] / source4 / ntptr / ntptr_base.c

diff --git a/source4/ntptr/ntptr_base.c b/source4/ntptr/ntptr_base.c
index 275f2045248c95b960353255d49bb3994db440bc..3fe8960602a35dd7b135caeb4e08ed3fa67d3535 100644 (file)
--- a/source4/ntptr/ntptr_base.c
+++ b/source4/ntptr/ntptr_base.c
@@ -24,8 +24,8 @@
 
 #include "includes.h"
 #include "ntptr/ntptr.h"
-#include "build.h"
 #include "param/param.h"
+#include "lib/util/samba_modules.h"
 
 /* the list of currently registered NTPTR backends */
 static struct ntptr_backend {
@@ -69,10 +69,12 @@ NTSTATUS ntptr_register(const void *_ops)
        return NT_STATUS_OK;
 }
 
-NTSTATUS ntptr_init(struct loadparm_context *lp_ctx)
+NTSTATUS ntptr_init(void)
 {
-       init_module_fn static_init[] = { STATIC_ntptr_MODULES, NULL };
-       init_module_fn *shared_init = load_samba_modules(NULL, lp_ctx, "ntptr");
+#define _MODULE_PROTO(init) extern NTSTATUS init(void);
+       STATIC_ntptr_MODULES_PROTO;
+       init_module_fn static_init[] = { STATIC_ntptr_MODULES };
+       init_module_fn *shared_init = load_samba_modules(NULL, "ntptr");
 
        run_init_functions(static_init);
        run_init_functions(shared_init);
@@ -119,7 +121,8 @@ const struct ntptr_critical_sizes *ntptr_interface_version(void)
 /*
   create a ntptr_context with a specified NTPTR backend
 */
-NTSTATUS ntptr_init_context(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
+NTSTATUS ntptr_init_context(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx,
+                           struct loadparm_context *lp_ctx,
                            const char *providor, struct ntptr_context **_ntptr)
 {
        NTSTATUS status;
@@ -133,6 +136,7 @@ NTSTATUS ntptr_init_context(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx
        NT_STATUS_HAVE_NO_MEMORY(ntptr);
        ntptr->private_data     = NULL;
        ntptr->ops              = ntptr_backend_byname(providor);
+       ntptr->ev_ctx           = ev_ctx;
        ntptr->lp_ctx           = lp_ctx;
 
        if (!ntptr->ops) {