lib/util Rename samba_modules_load -> samba_module_init_fns_for_subsystem

This is to provide a cleaner namespace in the public samba plugin
functions.

Andrew Bartlett

diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c
index def4af33ed3420ad1ba1737c1f04103711b3899a..a48606f7cd1b4ad34cbbf14c683efcdf8fdcb2c0 100644 (file)
--- a/auth/gensec/gensec_start.c
+++ b/auth/gensec/gensec_start.c
@@ -887,7 +887,7 @@ _PUBLIC_ NTSTATUS gensec_init(void)
        if (initialized) return NT_STATUS_OK;
        initialized = true;
 
        if (initialized) return NT_STATUS_OK;
        initialized = true;
 

-       shared_init = samba_modules_load(NULL, "gensec");
+       shared_init = samba_module_init_fns_for_subsystem(NULL, "gensec");

 
        samba_module_init_fns_run(static_init);
        samba_module_init_fns_run(shared_init);
 
        samba_module_init_fns_run(static_init);
        samba_module_init_fns_run(shared_init);

diff --git a/lib/util/samba_module.c b/lib/util/samba_module.c
index 6dc42eaf08828fe659bbfca3d584bc880e79d336..b15885be0360a8886d628779bd67fd4259b0d3ca 100644 (file)
--- a/lib/util/samba_module.c
+++ b/lib/util/samba_module.c
@@ -49,7 +49,7 @@ bool samba_module_init_fns_run(samba_module_init_fn *fns)
  * Will return an array of function pointers to initialization functions
  */
 
  * Will return an array of function pointers to initialization functions
  */
 

-samba_module_init_fn *samba_modules_load(TALLOC_CTX *mem_ctx, const char *subsystem)
+samba_module_init_fn *samba_module_init_fns_for_subsystem(TALLOC_CTX *mem_ctx, const char *subsystem)

 {
        char *path = modules_path(mem_ctx, subsystem);
        samba_module_init_fn *ret;
 {
        char *path = modules_path(mem_ctx, subsystem);
        samba_module_init_fn *ret;

diff --git a/lib/util/samba_module.h b/lib/util/samba_module.h
index 6d32fce48ef4dd040790fcfb3eeb919223e925ed..fa9a6b905d96c6a21092d23f8cf8506c5dbd2f5d 100644 (file)
--- a/lib/util/samba_module.h
+++ b/lib/util/samba_module.h
@@ -44,6 +44,6 @@ bool samba_module_init_fns_run(samba_module_init_fn *fns);
  *
  * Will return an array of function pointers to initialization functions
  */
  *
  * Will return an array of function pointers to initialization functions
  */

-samba_module_init_fn *samba_modules_load(TALLOC_CTX *mem_ctx, const char *subsystem);
+samba_module_init_fn *samba_module_init_fns_for_subsystem(TALLOC_CTX *mem_ctx, const char *subsystem);

 
 #endif /* _SAMBA_MODULES_H */
 
 #endif /* _SAMBA_MODULES_H */

diff --git a/source4/ntptr/ntptr_base.c b/source4/ntptr/ntptr_base.c
index 04114e9af5c71472994db6517559497dda43abeb..9b89f8a6fc9ab7bb0e6ef91769c93bbdb0736a29 100644 (file)
--- a/source4/ntptr/ntptr_base.c
+++ b/source4/ntptr/ntptr_base.c
@@ -74,7 +74,7 @@ NTSTATUS ntptr_init(void)
 #define _MODULE_PROTO(init) extern NTSTATUS init(void);
        STATIC_ntptr_MODULES_PROTO;
        samba_module_init_fn static_init[] = { STATIC_ntptr_MODULES };
 #define _MODULE_PROTO(init) extern NTSTATUS init(void);
        STATIC_ntptr_MODULES_PROTO;
        samba_module_init_fn static_init[] = { STATIC_ntptr_MODULES };

-       samba_module_init_fn *shared_init = samba_modules_load(NULL, "ntptr");
+       samba_module_init_fn *shared_init = samba_module_init_fns_for_subsystem(NULL, "ntptr");

 
        samba_module_init_fns_run(static_init);
        samba_module_init_fns_run(shared_init);
 
        samba_module_init_fns_run(static_init);
        samba_module_init_fns_run(shared_init);

diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c
index f34ea7b7dd5f69159765d52c374cd8d96a646aa4..fbf7d12ec36bc4e8ad4bf28792d8459f8cd36e5c 100644 (file)
--- a/source4/ntvfs/ntvfs_base.c
+++ b/source4/ntvfs/ntvfs_base.c
@@ -236,7 +236,7 @@ NTSTATUS ntvfs_init(struct loadparm_context *lp_ctx)
        if (initialized) return NT_STATUS_OK;
        initialized = true;
        
        if (initialized) return NT_STATUS_OK;
        initialized = true;
        

-       shared_init = samba_modules_load(NULL, "ntvfs");
+       shared_init = samba_module_init_fns_for_subsystem(NULL, "ntvfs");

 
        samba_module_init_fns_run(static_init);
        samba_module_init_fns_run(shared_init);
 
        samba_module_init_fns_run(static_init);
        samba_module_init_fns_run(shared_init);

diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index 546a8fc01a0c3b46968a1723f91fd4ceaef0c05d..d040537001f3ab178666fd904219f468421a40f8 100644 (file)
--- a/source4/ntvfs/posix/pvfs_acl.c
+++ b/source4/ntvfs/posix/pvfs_acl.c
@@ -93,7 +93,7 @@ NTSTATUS pvfs_acl_init(void)
        if (initialized) return NT_STATUS_OK;
        initialized = true;
 
        if (initialized) return NT_STATUS_OK;
        initialized = true;
 

-       shared_init = samba_modules_load(NULL, "pvfs_acl");
+       shared_init = samba_module_init_fns_for_subsystem(NULL, "pvfs_acl");

 
        samba_module_init_fns_run(static_init);
        samba_module_init_fns_run(shared_init);
 
        samba_module_init_fns_run(static_init);
        samba_module_init_fns_run(shared_init);

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 1eb2694de2f7ae76460cb87df13aa1f2da731daa..9dff4e4bb18dcce0cd885822b91399f589bc6259 100644 (file)
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -1236,7 +1236,7 @@ void dcerpc_server_init(struct loadparm_context *lp_ctx)
        }
        initialized = true;
 
        }
        initialized = true;
 

-       shared_init = samba_modules_load(NULL, "dcerpc_server");
+       shared_init = samba_module_init_fns_for_subsystem(NULL, "dcerpc_server");

 
        samba_module_init_fns_run(static_init);
        samba_module_init_fns_run(shared_init);
 
        samba_module_init_fns_run(static_init);
        samba_module_init_fns_run(shared_init);

diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c
index d194d19747c5a79256ddf2979fb4d7ba95229f00..b3ac07e4a64452a4eb9377081f4b97653ea5687f 100644 (file)
--- a/source4/smbd/process_model.c
+++ b/source4/smbd/process_model.c
@@ -112,7 +112,7 @@ _PUBLIC_ NTSTATUS process_model_init(struct loadparm_context *lp_ctx)
        }
        initialised = true;
 
        }
        initialised = true;
 

-       shared_init = samba_modules_load(NULL, "process_model");
+       shared_init = samba_module_init_fns_for_subsystem(NULL, "process_model");

        
        samba_module_init_fns_run(static_init);
        samba_module_init_fns_run(shared_init);
        
        samba_module_init_fns_run(static_init);
        samba_module_init_fns_run(shared_init);

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 6df55b88b609711b045e34ac213de9c441d07340..a2f4a785ad23b6bbb6544c9363d9ee8f325fe2f6 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -409,7 +409,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 
        process_model_init(cmdline_lp_ctx); 
 
 
        process_model_init(cmdline_lp_ctx); 
 

-       shared_init = samba_modules_load(NULL, "service");
+       shared_init = samba_module_init_fns_for_subsystem(NULL, "service");

 
        samba_module_init_fns_run(static_init);
        samba_module_init_fns_run(shared_init);
 
        samba_module_init_fns_run(static_init);
        samba_module_init_fns_run(shared_init);

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index d00351de3227cc91202c933e305bfc85213e97cf..dc35073eba826c3033dff552cf1376c4da1cf169 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -49,7 +49,7 @@ _PUBLIC_ int torture_init(void)
 #define _MODULE_PROTO(init) extern NTSTATUS init(void);
        STATIC_smbtorture_MODULES_PROTO;
        samba_module_init_fn static_init[] = { STATIC_smbtorture_MODULES };
 #define _MODULE_PROTO(init) extern NTSTATUS init(void);
        STATIC_smbtorture_MODULES_PROTO;
        samba_module_init_fn static_init[] = { STATIC_smbtorture_MODULES };

-       samba_module_init_fn *shared_init = samba_modules_load(NULL, "smbtorture");
+       samba_module_init_fn *shared_init = samba_module_init_fns_for_subsystem(NULL, "smbtorture");

 
        samba_module_init_fns_run(static_init);
        samba_module_init_fns_run(shared_init);
 
        samba_module_init_fns_run(static_init);
        samba_module_init_fns_run(shared_init);