talons

Fork of Claws Mail https://www.claws-mail
Log | Files | Refs | README | LICENSE

commit 72625ef0e7aa36459e76733fb34ced337e17f748
parent 32955775f6308ccc9f09fb0fb2750574427df144
Author: wwp <wwp@free.fr>
Date:   Tue, 10 Jan 2017 15:58:05 +0100

Be more clear about what 108 means here towards the Unix socket
path value lenght: rely on UNIX_PATH_MAX and fallback to its common
value '108' in not defined in un.h (caution, on other systems, it could
be 104, etc. down to 92).

Diffstat:
Msrc/plugins/clamd/libclamd/clamd-plugin.c | 9+++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/plugins/clamd/libclamd/clamd-plugin.c b/src/plugins/clamd/libclamd/clamd-plugin.c @@ -301,9 +301,14 @@ static int create_socket() { } debug_print("socket file (create): %d\n", new_sock); addr_u.sun_family = AF_UNIX; - if (strlen(Socket->socket.path) > 108) { - g_error("socket path longer than 108-char: %s", Socket->socket.path); +#ifndef UNIX_PATH_MAX +#define UNIX_PATH_MAX 108 +#endif + if (strlen(Socket->socket.path) > UNIX_PATH_MAX) { + g_error("socket path longer than %d-char: %s", + UNIX_PATH_MAX, Socket->socket.path); new_sock = -2; +#undef UNIX_PATH_MAX } else { memcpy(addr_u.sun_path, Socket->socket.path, strlen(Socket->socket.path));