From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 1 Sep 2016 10:34:46 +0000 (+0100)
Subject: [Fix] Use the correct macro to get the size of control
X-Git-Tag: 1.3.5~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8535d0c7fde02b8892b466388e3a0ac4342a1bfc;p=thirdparty%2Frspamd.git

[Fix] Use the correct macro to get the size of control
---

diff --git a/src/libserver/rspamd_control.c b/src/libserver/rspamd_control.c
index da573fa94a..d680c35b1f 100644
--- a/src/libserver/rspamd_control.c
+++ b/src/libserver/rspamd_control.c
@@ -342,7 +342,7 @@ rspamd_control_wrk_io (gint fd, short what, gpointer ud)
 					strerror (errno));
 		}
 		else if (r >= (gssize)sizeof (elt->reply)) {
-			if (msg.msg_controllen >= CMSG_SPACE(sizeof (int))) {
+			if (msg.msg_controllen >= CMSG_LEN (sizeof (int))) {
 				elt->attached_fd = *(int *) CMSG_DATA(CMSG_FIRSTHDR (&msg));
 			}
 		}
@@ -635,7 +635,7 @@ rspamd_control_default_worker_handler (gint fd, short what, gpointer ud)
  	}
 	else if ((gint)cmd.type >= 0 && cmd.type < RSPAMD_CONTROL_MAX) {
 
-		if (msg.msg_controllen >= CMSG_SPACE(sizeof (int))) {
+		if (msg.msg_controllen >= CMSG_LEN (sizeof (int))) {
 			rfd = *(int *) CMSG_DATA(CMSG_FIRSTHDR (&msg));
 		}
 
@@ -774,7 +774,7 @@ rspamd_srv_handler (gint fd, short what, gpointer ud)
 			rdata->rep.id = cmd.id;
 			rdata->rep.type = cmd.type;
 			rdata->fd = -1;
-			if (msg.msg_controllen >= CMSG_SPACE(sizeof (int))) {
+			if (msg.msg_controllen >= CMSG_LEN (sizeof (int))) {
 				rfd = *(int *) CMSG_DATA(CMSG_FIRSTHDR (&msg));
 			}
 
@@ -972,7 +972,7 @@ rspamd_srv_request_handler (gint fd, short what, gpointer ud)
 			goto cleanup;
 		}
 
-		if (msg.msg_controllen >= CMSG_SPACE(sizeof (int))) {
+		if (msg.msg_controllen >= CMSG_LEN (sizeof (int))) {
 			rfd = *(int *) CMSG_DATA(CMSG_FIRSTHDR (&msg));
 		}