sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

smbd: remove process shortname arg from smbd_reinit_after_fork()

Browse Source 
All callers already do this explicitly by calling process_set_title().

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2022-12-03 16:59:39 +01:00 committed by Jeremy Allison
parent 62cc0bbab0
commit 38ba7d1476
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/include/proto.h
View File

@ -305,8 +305,7 @@ NTSTATUS reinit_after_fork(struct messaging_context *msg_ctx,
const char *comment);
NTSTATUS smbd_reinit_after_fork(struct messaging_context *msg_ctx,
struct tevent_context *ev_ctx,
bool parent_longlived,
const char *comment);
bool parent_longlived);
void *malloc_(size_t size);
void *Realloc(void *p, size_t size, bool free_old_on_error);
void add_to_large_array(TALLOC_CTX *mem_ctx, size_t element_size,

2
source3/smbd/scavenger.c
View File

@ -246,7 +246,7 @@ static bool smbd_scavenger_start(struct smbd_scavenger_state *state)
close(fds[0]);
status = smbd_reinit_after_fork(state->msg, state->ev,
true, "smbd-scavenger");
true);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(2, ("reinit_after_fork failed: %s\n",
nt_errstr(status)));

6
source3/smbd/server.c
View File

@ -428,7 +428,7 @@ static bool smbd_notifyd_init(struct messaging_context *msg, bool interactive,
return true;
}
status = smbd_reinit_after_fork(msg, ev, true, "smbd-notifyd");
status = smbd_reinit_after_fork(msg, ev, true);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, ("%s: reinit_after_fork failed: %s\n",
__func__, nt_errstr(status)));
@ -644,7 +644,7 @@ static bool cleanupd_init(struct messaging_context *msg, bool interactive,
close(up_pipe[0]);
status = smbd_reinit_after_fork(msg, ev, true, "cleanupd");
status = smbd_reinit_after_fork(msg, ev, true);
if (!NT_STATUS_IS_OK(status)) {
DBG_WARNING("reinit_after_fork failed: %s\n",
nt_errstr(status));
@ -1014,7 +1014,7 @@ static void smbd_accept_connection(struct tevent_context *ev,
* them, counting worker smbds. */
CatchChild();
status = smbd_reinit_after_fork(msg_ctx, ev, true, NULL);
status = smbd_reinit_after_fork(msg_ctx, ev, true);
if (!NT_STATUS_IS_OK(status)) {
if (NT_STATUS_EQUAL(status,
NT_STATUS_TOO_MANY_OPENED_FILES)) {

4
source3/smbd/server_exit.c
View File

@ -252,11 +252,11 @@ void smbd_exit_server_cleanly(const char *const explanation)
*/
NTSTATUS smbd_reinit_after_fork(struct messaging_context *msg_ctx,
struct tevent_context *ev_ctx,
bool parent_longlived, const char *comment)
bool parent_longlived)
{
NTSTATUS ret;
am_parent = NULL;
ret = reinit_after_fork(msg_ctx, ev_ctx, parent_longlived, comment);
ret = reinit_after_fork(msg_ctx, ev_ctx, parent_longlived, NULL);
initialize_password_db(true, ev_ctx);
return ret;
}

3
source3/smbd/smb1_process.c
View File

@ -2606,8 +2606,7 @@ bool fork_echo_handler(struct smbXsrv_connection *xconn)
status = smbd_reinit_after_fork(xconn->client->msg_ctx,
xconn->client->raw_ev_ctx,
true,
"smbd-echo");
true);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, ("reinit_after_fork failed: %s\n",
nt_errstr(status)));