diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-25 13:00:22 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-31 00:32:07 +0200 |
| commit | 8524924a460349a9aa56db475d771b8884fbe517 (patch) | |
| tree | e96bf4378c676fdf8f4d2ba6f993aea9837e315e /source3/smbd/server_reload.c | |
| parent | c981d4fa1269569a1c2db4bf72a67a357aacd69f (diff) | |
| download | samba-8524924a460349a9aa56db475d771b8884fbe517.tar.gz samba-8524924a460349a9aa56db475d771b8884fbe517.tar.bz2 samba-8524924a460349a9aa56db475d771b8884fbe517.zip | |
s3-smbd provide struct smbd_server_connection * to conn_snum_used
This provides the 'sconn' parameter to this key functions, that
is currently duplicated in dummysmbd.c, which causes duplicate symbol
issues in the waf build.
This has natrually caused a number of consequential changes across the
codebase, includning not passing a messaging context into initial
reload_services():
This causes problems because the global smbd_server_connection isn't
yet set up, as there isn't a connection here, just the initial
process.
Andrew Bartlett
Diffstat (limited to 'source3/smbd/server_reload.c')
| -rw-r--r-- | source3/smbd/server_reload.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c index 82b0cb03e9..fef66dac6a 100644 --- a/source3/smbd/server_reload.c +++ b/source3/smbd/server_reload.c @@ -113,7 +113,11 @@ bool reload_services(struct messaging_context *msg_ctx, int smb_sock, if (test && !lp_file_list_changed()) return(True); - lp_killunused(conn_snum_used); + if (msg_ctx) { + lp_killunused(msg_ctx_to_sconn(msg_ctx), conn_snum_used); + } else { + lp_killunused(NULL, NULL); + } ret = lp_load(get_dyn_CONFIGFILE(), False, False, True, True); |