From: Matthias Dieter Wallnöfer Date: Sun, 12 Dec 2010 11:33:08 +0000 (+0100) Subject: s4:smbd/process*.c - fix PID warnings on Solaris X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=faa7ae47d675c3007e53737eef70c34675e952ba s4:smbd/process*.c - fix PID warnings on Solaris Autobuild-User: Matthias Dieter Wallnöfer Autobuild-Date: Sun Dec 12 13:21:13 CET 2010 on sn-devel-104 --- diff --git a/source4/smbd/process_onefork.c b/source4/smbd/process_onefork.c index 5194e1bda635..59e583dca376 100644 --- a/source4/smbd/process_onefork.c +++ b/source4/smbd/process_onefork.c @@ -111,7 +111,7 @@ static void onefork_new_task(struct tevent_context *ev, smb_panic("Failed to re-initialise tevent after fork"); } - setproctitle("task %s server_id[%d]", service_name, pid); + setproctitle("task %s server_id[%d]", service_name, (int)pid); onefork_reload_after_fork(); diff --git a/source4/smbd/process_prefork.c b/source4/smbd/process_prefork.c index 71c1c57162aa..66222af63f75 100644 --- a/source4/smbd/process_prefork.c +++ b/source4/smbd/process_prefork.c @@ -122,7 +122,7 @@ static void prefork_new_task(struct tevent_context *ev, is not associated with this new connection */ talloc_free(ev); - setproctitle("task %s server_id[%d]", service_name, pid); + setproctitle("task %s server_id[%d]", service_name, (int)pid); prefork_reload_after_fork(); @@ -151,7 +151,7 @@ static void prefork_new_task(struct tevent_context *ev, return; } else { pid = getpid(); - setproctitle("task %s server_id[%d]", service_name, pid); + setproctitle("task %s server_id[%d]", service_name, (int)pid); prefork_reload_after_fork(); diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c index 99e815a160b5..c5cd9fd5b8ee 100644 --- a/source4/smbd/process_standard.c +++ b/source4/smbd/process_standard.c @@ -133,7 +133,7 @@ static void standard_accept_connection(struct tevent_context *ev, s = socket_get_my_addr(sock2, ev); if (s && c) { setproctitle("conn c[%s:%u] s[%s:%u] server_id[%d]", - c->addr, c->port, s->addr, s->port, pid); + c->addr, c->port, s->addr, s->port, (int)pid); } talloc_free(c); talloc_free(s); @@ -186,7 +186,7 @@ static void standard_new_task(struct tevent_context *ev, /* Ensure that the forked children do not expose identical random streams */ set_need_random_reseed(); - setproctitle("task %s server_id[%d]", service_name, pid); + setproctitle("task %s server_id[%d]", service_name, (int)pid); /* setup this new task. Cluster ID is PID based for this process modal */ new_task(ev, lp_ctx, cluster_id(pid, 0), private_data);