Import of pkgsrc-2016Q3

This commit is contained in:
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions

View File

@@ -0,0 +1,22 @@
$NetBSD: patch-conserver_readcfg.c,v 1.1 2016/03/13 18:31:11 schnoebe Exp $
Have readcfg.c use the same logic as main.c uses for setproctitle.
--- conserver/readcfg.c.orig 2015-06-02 17:19:31.000000000 +0000
+++ conserver/readcfg.c
@@ -5376,7 +5376,14 @@ ReReadCfg(int fd, int msfd)
local += pGE->imembers;
for (pRC = pRCList; (REMOTE *)0 != pRC; pRC = pRC->pRCnext)
remote++;
- setproctitle("master: port %hu, %d local, %d remote", bindPort,
+ setproctitle("master: port %hu, %d local, %d remote",
+#if USE_IPV6
+ config->primaryport,
+#elif USE_UNIX_DOMAIN_SOCKETS
+ 0,
+#else
+ bindPort,
+#endif
local, remote);
} else
setproctitle("group %u: port %hu, %d %s", pGroups->id,