mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

BUILD: use MAXPATHLEN instead of NAME_MAX.

Browse Source 
This fixes building on at least Solaris, where NAME_MAX doesn't exist.
This commit is contained in:
Olivier Houchard 2017-11-04 15:13:01 +01:00 committed by Willy Tarreau
parent a8d8d6e8f6
commit f143b8040b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli.c
View File

@ -1354,7 +1354,7 @@ static int _getsocks(char **args, struct appctx *appctx, void *private)
/* We will send sockets MAX_SEND_FD per MAX_SEND_FD, allocate a /* We will send sockets MAX_SEND_FD per MAX_SEND_FD, allocate a
* buffer big enough to store the socket informations. * buffer big enough to store the socket informations.
*/ */
tmpbuf = malloc(MAX_SEND_FD * (1 + NAME_MAX + 1 + IFNAMSIZ + sizeof(int))); tmpbuf = malloc(MAX_SEND_FD * (1 + MAXPATHLEN + 1 + IFNAMSIZ + sizeof(int)));
if (tmpbuf == NULL) { if (tmpbuf == NULL) {
Warning("Failed to allocate memory to transfer socket informations\n"); Warning("Failed to allocate memory to transfer socket informations\n");
goto out; goto out;

4
src/haproxy.c
View File

@ -968,7 +968,7 @@ static int get_old_sockets(const char *unixsocket)
ret = 0; ret = 0;
goto out; goto out;
} }
tmpbuf = malloc(fd_nb * (1 + NAME_MAX + 1 + IFNAMSIZ + sizeof(int))); tmpbuf = malloc(fd_nb * (1 + MAXPATHLEN + 1 + IFNAMSIZ + sizeof(int)));
if (tmpbuf == NULL) { if (tmpbuf == NULL) {
Warning("Failed to allocate memory while receiving sockets\n"); Warning("Failed to allocate memory while receiving sockets\n");
goto out; goto out;
@ -980,7 +980,7 @@ static int get_old_sockets(const char *unixsocket)
} }
msghdr.msg_control = cmsgbuf; msghdr.msg_control = cmsgbuf;
msghdr.msg_controllen = CMSG_SPACE(sizeof(int)) * MAX_SEND_FD; msghdr.msg_controllen = CMSG_SPACE(sizeof(int)) * MAX_SEND_FD;
iov.iov_len = MAX_SEND_FD * (1 + NAME_MAX + 1 + IFNAMSIZ + sizeof(int)); iov.iov_len = MAX_SEND_FD * (1 + MAXPATHLEN + 1 + IFNAMSIZ + sizeof(int));
do { do {
int ret3; int ret3;