diff options
author | Andrew Bartlett <abartlet@samba.org> | 2010-05-27 07:18:58 +0200 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2010-05-28 18:08:26 +0200 |
commit | 6f279de0e672996ff1c142202581e6471ed6e859 (patch) | |
tree | c8e7201e9e243b9cb6b321df06a0adf4bbeea40c /source3/torture | |
parent | 8bc32513da9f0009774b6efce76f26c2177a976a (diff) | |
download | samba-6f279de0e672996ff1c142202581e6471ed6e859.tar.gz samba-6f279de0e672996ff1c142202581e6471ed6e859.tar.bz2 samba-6f279de0e672996ff1c142202581e6471ed6e859.zip |
s3:smbd split reload services/printers functions from server.c
This helps vfstest, as it previously had duplicate copies of these
functions.
Andrew Bartlett
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/torture')
-rw-r--r-- | source3/torture/vfstest.c | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c index d5237827d8..c885163729 100644 --- a/source3/torture/vfstest.c +++ b/source3/torture/vfstest.c @@ -422,62 +422,6 @@ int smbd_server_fd(void) return server_fd; } -void reload_printers(void) -{ - return; -} - -/**************************************************************************** - Reload the services file. -**************************************************************************/ - -bool reload_services(bool test) -{ - bool ret; - - if (lp_loaded()) { - const char *fname = lp_configfile(); - if (file_exist(fname) && - !strcsequal(fname, get_dyn_CONFIGFILE())) { - set_dyn_CONFIGFILE(fname); - test = False; - } - } - - reopen_logs(); - - if (test && !lp_file_list_changed()) - return(True); - - lp_killunused(conn_snum_used); - - ret = lp_load(get_dyn_CONFIGFILE(), False, False, True, True); - - /* perhaps the config filename is now set */ - if (!test) - reload_services(True); - - reopen_logs(); - - load_interfaces(); - - { - if (smbd_server_fd() != -1) { - set_socket_options(smbd_server_fd(),"SO_KEEPALIVE"); - set_socket_options(smbd_server_fd(), - lp_socket_options()); - } - } - - mangle_reset_cache(); - reset_stat_cache(); - - /* this forces service parameters to be flushed */ - set_current_service(NULL,0,True); - - return (ret); -} - struct event_context *smbd_event_context(void) { static struct event_context *ctx; |