From 7f2d12c4c0c03a4a3b0262845968348697287033 Mon Sep 17 00:00:00 2001 From: Christof Schmitt Date: Tue, 1 Apr 2014 15:45:38 -0700 Subject: [PATCH] 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 Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Wed Apr 2 08:50:04 CEST 2014 on sn-devel-104 --- source3/modules/perfcount_test.c | 2 +- source3/winbindd/idmap_ad.c | 2 +- source3/winbindd/idmap_autorid.c | 2 +- source3/winbindd/idmap_hash/idmap_hash.c | 2 +- source3/winbindd/idmap_rid.c | 2 +- source3/winbindd/idmap_tdb2.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source3/modules/perfcount_test.c b/source3/modules/perfcount_test.c index 8d17ee513f4..c0b53360c72 100644 --- 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 8b63801906b..047511f294d 100644 --- 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 4669b8dba59..35b4b68ba56 100644 --- 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 bff1e9e3fad..1dbd300fbb4 100644 --- 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 f10f493496c..0856c802375 100644 --- 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 942490d58b8..1abc9380642 100644 --- 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); }