Rename module init functions from samba_init_module

Some modules use samba_init_module as the name for the init functions,
others use a name based on the module name.

Rename the init functions from samba_init_module, to be consistent
across all modules. This change also allows to build idmap_tdb2 and
perfcount_test statically.

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Apr  2 08:50:04 CEST 2014 on sn-devel-104

diff --git a/source3/modules/perfcount_test.c b/source3/modules/perfcount_test.c
index 8d17ee513f4fdd875ca64c510ce88b5bc637b7c0..c0b53360c72269d0553f9fc29a041f1ab8985731 100644 (file)
--- a/source3/modules/perfcount_test.c
+++ b/source3/modules/perfcount_test.c
@@ -381,7 +381,7 @@ static struct smb_perfcount_handlers perfcount_test_handlers = {
        perfcount_test_end
 };
 
-NTSTATUS samba_init_module(void)
+NTSTATUS perfcount_test_init(void)
 {
        return smb_register_perfcounter(SMB_PERFCOUNTER_INTERFACE_VERSION,
                                        "pc_test", &perfcount_test_handlers);

diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index 8b63801906bc3bd817ae904c0eb7c808ebe8ba51..047511f294da071cc1994e7c5434d39205af710d 100644 (file)
--- a/source3/winbindd/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
@@ -962,7 +962,7 @@ static struct nss_info_methods nss_sfu20_methods = {
  Initialize the plugins
  ***********************************************************************/
 
-NTSTATUS samba_init_module(void)
+NTSTATUS idmap_ad_init(void)
 {
        static NTSTATUS status_idmap_ad = NT_STATUS_UNSUCCESSFUL;
        static NTSTATUS status_nss_rfc2307 = NT_STATUS_UNSUCCESSFUL;

diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index 4669b8dba59b871feb4072dc51705c830eb8902a..35b4b68ba56f374d7b30b048760c7336b6fe6958 100644 (file)
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -688,7 +688,7 @@ static struct idmap_methods autorid_methods = {
        .allocate_id     = idmap_autorid_allocate_id
 };
 
-NTSTATUS samba_init_module(void)
+NTSTATUS idmap_autorid_init(void)
 {
        return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION,
                                  "autorid", &autorid_methods);

diff --git a/source3/winbindd/idmap_hash/idmap_hash.c b/source3/winbindd/idmap_hash/idmap_hash.c
index bff1e9e3fad336674201b032d22690cb889d5e75..1dbd300fbb4acae4ba66f005d24aa8a74d2f3bea 100644 (file)
--- a/source3/winbindd/idmap_hash/idmap_hash.c
+++ b/source3/winbindd/idmap_hash/idmap_hash.c
@@ -366,7 +366,7 @@ static struct nss_info_methods hash_nss_methods = {
  state.
  **********************************************************************/
 
-NTSTATUS samba_init_module(void)
+NTSTATUS idmap_hash_init(void)
 {
        static NTSTATUS idmap_status = NT_STATUS_UNSUCCESSFUL;
        static NTSTATUS nss_status = NT_STATUS_UNSUCCESSFUL;

diff --git a/source3/winbindd/idmap_rid.c b/source3/winbindd/idmap_rid.c
index f10f493496c301f9f789953d1ef574b794e883bd..0856c802375136b81452a1a2429f38b94e149487 100644 (file)
--- a/source3/winbindd/idmap_rid.c
+++ b/source3/winbindd/idmap_rid.c
@@ -189,7 +189,7 @@ static struct idmap_methods rid_methods = {
        .sids_to_unixids = idmap_rid_sids_to_unixids,
 };
 
-NTSTATUS samba_init_module(void)
+NTSTATUS idmap_rid_init(void)
 {
        return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "rid", &rid_methods);
 }

diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c
index 942490d58b825c1cdcea6630da090ac6c7d97d4b..1abc938064202dc052e90ec723325b7be0eb8b59 100644 (file)
--- a/source3/winbindd/idmap_tdb2.c
+++ b/source3/winbindd/idmap_tdb2.c
@@ -609,7 +609,7 @@ static struct idmap_methods db_methods = {
        .allocate_id     = idmap_tdb_common_get_new_id
 };
 
-NTSTATUS samba_init_module(void)
+NTSTATUS idmap_tdb2_init(void)
 {
        return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "tdb2", &db_methods);
 }