ExternalVendorCode/conserver
1
0
Fork 0
mirror of https://github.com/bstansell/conserver.git synced 2024-12-20 05:17:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make compile --with-ipv6 & setproctitle

Browse Source 
If compiling with IPv6 support and setproctitle two places are using
the wrong type (char *) instead of (ushort) or a non-existent variable.
Fix these to make --with-ipv6 compile on FreeBSD.
This commit is contained in:
Bjoern A. Zeeb 2021-07-15 17:49:49 +00:00
parent 8b3dfdb14f
commit e801b9cc75
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conserver/main.c
View File

@ -1770,7 +1770,7 @@ main(int argc, char **argv)
remote++; remote++;
setproctitle("master: port %hu, %d local, %d remote", setproctitle("master: port %hu, %d local, %d remote",
# if USE_IPV6 # if USE_IPV6
config->primaryport, (unsigned short)strtol(config->primaryport, NULL, 10),
# elif USE_UNIX_DOMAIN_SOCKETS # elif USE_UNIX_DOMAIN_SOCKETS
(unsigned short)0, (unsigned short)0,
# else # else

7
conserver/readcfg.c
View File

@ -5374,7 +5374,12 @@ ReReadCfg(int fd, int msfd)
local += pGE->imembers; local += pGE->imembers;
for (pRC = pRCList; (REMOTE *)0 != pRC; pRC = pRC->pRCnext) for (pRC = pRCList; (REMOTE *)0 != pRC; pRC = pRC->pRCnext)
remote++; remote++;
setproctitle("master: port %hu, %d local, %d remote", bindPort, setproctitle("master: port %hu, %d local, %d remote",
# if !USE_UNIX_DOMAIN_SOCKETS
(unsigned short)strtol(config->primaryport, NULL, 10),
# else
(unsigned short)0,
# endif
local, remote); local, remote);
} else } else
setproctitle("group %u: port %hu, %d %s", pGroups->id, setproctitle("group %u: port %hu, %d %s", pGroups->id,