diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-04-03 13:23:18 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-03 14:25:12 +1000 |
| commit | c363815809b4f6ff06f42baddaf4545de4cb9217 (patch) | |
| tree | 7fea9ad47804d9e620501a667965b9b54a55ff7e | |
| parent | 4d53e7c2ba59d4572a6198785e49eeaf88cd1a02 (diff) | |
| download | samba-c363815809b4f6ff06f42baddaf4545de4cb9217.tar.gz samba-c363815809b4f6ff06f42baddaf4545de4cb9217.tar.bz2 samba-c363815809b4f6ff06f42baddaf4545de4cb9217.zip | |
s3-smbd: Inline init_modules() into only caller
| -rw-r--r-- | source3/lib/util.c | 9 | ||||
| -rw-r--r-- | source3/smbd/process.c | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index 7be056c68b..d6e8ed8090 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -2446,12 +2446,3 @@ bool map_open_params_to_ntcreate(const char *smb_base_fname, return True; } - - -void init_modules(void) -{ - /* FIXME: This can cause undefined symbol errors : - * smb_register_vfs() isn't available in nmbd, for example */ - if(lp_preload_modules()) - smb_load_modules(lp_preload_modules()); -} diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 30dbc0c6dd..ae4a1c01c1 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -3296,7 +3296,9 @@ void smbd_process(struct tevent_context *ev_ctx, tsocket_address_string(remote_address, talloc_tos()), tsocket_address_string(local_address, talloc_tos()))); - init_modules(); + if (lp_preload_modules()) { + smb_load_modules(lp_preload_modules()); + } smb_perfcount_init(); |