diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/exports/modules-darwin.syms | 2 | ||||
| -rw-r--r-- | source3/m4/aclocal.m4 | 2 | ||||
| -rw-r--r-- | source3/modules/perfcount_test.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/idmap_ad.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/idmap_adex/idmap_adex.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/idmap_autorid.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/idmap_hash/idmap_hash.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/idmap_rid.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/idmap_tdb2.c | 2 | ||||
| -rw-r--r-- | source3/wscript | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/source3/exports/modules-darwin.syms b/source3/exports/modules-darwin.syms index 276543b8de..b4bd6f3e8b 100644 --- a/source3/exports/modules-darwin.syms +++ b/source3/exports/modules-darwin.syms @@ -1 +1 @@ -_samba_init_module +_samba_module_init diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4 index a4db42e5ca..8eef69d704 100644 --- a/source3/m4/aclocal.m4 +++ b/source3/m4/aclocal.m4 @@ -25,7 +25,7 @@ AC_DEFUN(SMB_MODULE, fi if test x"$DEST" = xSHARED; then - AC_DEFINE([$1][_init], [samba_init_module], [Whether to build $1 as shared module]) + AC_DEFINE([$1][_init], [samba_module_init], [Whether to build $1 as shared module]) $4_MODULES="$$4_MODULES $3" AC_MSG_RESULT([shared]) [$6] diff --git a/source3/modules/perfcount_test.c b/source3/modules/perfcount_test.c index 8d17ee513f..5365362783 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 samba_module_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 a3ecc476e6..ab44f89355 100644 --- a/source3/winbindd/idmap_ad.c +++ b/source3/winbindd/idmap_ad.c @@ -1096,7 +1096,7 @@ static struct nss_info_methods nss_sfu20_methods = { Initialize the plugins ***********************************************************************/ -NTSTATUS samba_init_module(void) +NTSTATUS samba_module_init(void) { static NTSTATUS status_idmap_ad = NT_STATUS_UNSUCCESSFUL; static NTSTATUS status_nss_rfc2307 = NT_STATUS_UNSUCCESSFUL; diff --git a/source3/winbindd/idmap_adex/idmap_adex.c b/source3/winbindd/idmap_adex/idmap_adex.c index 56e025d801..3ddd71624a 100644 --- a/source3/winbindd/idmap_adex/idmap_adex.c +++ b/source3/winbindd/idmap_adex/idmap_adex.c @@ -385,7 +385,7 @@ static struct nss_info_methods adex_nss_methods = { against the idmap and nss_info interfaces being in a half-registered state. **********************************************************************/ -NTSTATUS samba_init_module(void) +NTSTATUS samba_module_init(void) { static NTSTATUS idmap_status = NT_STATUS_UNSUCCESSFUL; static NTSTATUS nss_status = NT_STATUS_UNSUCCESSFUL; diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c index 1a88fd4cb8..8d32f0e349 100644 --- a/source3/winbindd/idmap_autorid.c +++ b/source3/winbindd/idmap_autorid.c @@ -668,7 +668,7 @@ static struct idmap_methods autorid_methods = { .allocate_id = idmap_autorid_allocate_id }; -NTSTATUS samba_init_module(void) +NTSTATUS samba_module_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 1f36b217ef..4a61f4e7b3 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 samba_module_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 4112fb860a..c01b45b1b4 100644 --- a/source3/winbindd/idmap_rid.c +++ b/source3/winbindd/idmap_rid.c @@ -187,7 +187,7 @@ static struct idmap_methods rid_methods = { .sids_to_unixids = idmap_rid_sids_to_unixids, }; -NTSTATUS samba_init_module(void) +NTSTATUS samba_module_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 ac3743e523..4ffb60a2c8 100644 --- a/source3/winbindd/idmap_tdb2.c +++ b/source3/winbindd/idmap_tdb2.c @@ -874,7 +874,7 @@ static struct idmap_methods db_methods = { .allocate_id = idmap_tdb2_get_new_id }; -NTSTATUS samba_init_module(void) +NTSTATUS samba_module_init(void) { return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "tdb2", &db_methods); } diff --git a/source3/wscript b/source3/wscript index 5746533eff..26152f5169 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1722,7 +1722,7 @@ main() { conf.DEFINE('static_init_%s' % p, '{}') if p in shared_list: for entry in shared_list[p]: - conf.DEFINE('%s_init' % entry, 'samba_init_module') + conf.DEFINE('%s_init' % entry, 'samba_module_init') conf.env[shared_env].append('%s' % entry) conf.SAMBA_CONFIG_H('include/config.h') |