diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-04-26 12:15:01 +0000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2006-04-26 12:15:01 +0000 |
| commit | ef44c0f26d20a17d5cd0687df51a0cd5a51cb962 (patch) | |
| tree | 91e9cadae3a0a07f4ee3f4d32182f17192446afe | |
| parent | 24063c7bc2609f26bd95966bd40eb55223163cea (diff) | |
| download | samba-ef44c0f26d20a17d5cd0687df51a0cd5a51cb962.tar.gz samba-ef44c0f26d20a17d5cd0687df51a0cd5a51cb962.tar.xz samba-ef44c0f26d20a17d5cd0687df51a0cd5a51cb962.zip | |
r15273: fix setproctitle support
metze
| -rw-r--r-- | source/smbd/process_standard.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/source/smbd/process_standard.c b/source/smbd/process_standard.c index e77985253b9..f5dda116800 100644 --- a/source/smbd/process_standard.c +++ b/source/smbd/process_standard.c @@ -39,7 +39,11 @@ #include <setproctitle.h> #endif #else -#define setproctitle(x) +static int setproctitle(const char *fmt, ...) PRINTF_ATTRIBUTE(1, 2); +static int setproctitle(const char *fmt, ...) +{ + return 0; +} #endif /* @@ -120,8 +124,8 @@ static void standard_accept_connection(struct event_context *ev, c = socket_get_peer_addr(sock2, ev2); s = socket_get_my_addr(sock2, ev2); if (s && c) { - setproctitle(("conn c[%s:%u] s[%s:%u] server_id[%d]", - c->addr, c->port, s->addr, s->port, pid)); + setproctitle("conn c[%s:%u] s[%s:%u] server_id[%d]", + c->addr, c->port, s->addr, s->port, pid); } talloc_free(c); talloc_free(s); @@ -177,7 +181,7 @@ static void standard_new_task(struct event_context *ev, /* Ensure that the forked children do not expose identical random streams */ set_need_random_reseed(); - setproctitle(("task server_id[%d]", pid)); + setproctitle("task server_id[%d]", pid); /* setup this new connection */ new_task(ev2, pid, private); @@ -214,9 +218,9 @@ static void standard_terminate(struct event_context *ev, const char *reason) static void standard_set_title(struct event_context *ev, const char *title) { if (title) { - setproctitle(("%s", title)); + setproctitle("%s", title); } else { - setproctitle((NULL)); + setproctitle(NULL); } } |