diff options
| -rw-r--r-- | net/samba411/Makefile | 2 | ||||
| -rw-r--r-- | net/samba411/files/patch-source3_lib_messages.c | 29 | ||||
| -rw-r--r-- | net/samba412/Makefile | 2 | ||||
| -rw-r--r-- | net/samba412/files/patch-source3_lib_messages.c | 29 | ||||
| -rw-r--r-- | net/samba413/Makefile | 2 | ||||
| -rw-r--r-- | net/samba413/files/patch-source3_lib_messages.c | 29 |
6 files changed, 90 insertions, 3 deletions
diff --git a/net/samba411/Makefile b/net/samba411/Makefile index b677a39874cb..e3b15993882b 100644 --- a/net/samba411/Makefile +++ b/net/samba411/Makefile @@ -3,7 +3,7 @@ PORTNAME= ${SAMBA4_BASENAME}411 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} diff --git a/net/samba411/files/patch-source3_lib_messages.c b/net/samba411/files/patch-source3_lib_messages.c new file mode 100644 index 000000000000..8b45d464f07f --- /dev/null +++ b/net/samba411/files/patch-source3_lib_messages.c @@ -0,0 +1,29 @@ +--- source3/lib/messages.c.orig 2020-01-08 10:24:52 UTC ++++ source3/lib/messages.c +@@ -158,7 +158,7 @@ struct messaging_rec *messaging_rec_create( + + { + struct messaging_rec rec; +- int64_t fds64[num_fds]; ++ int64_t fds64[MAX(1, num_fds)]; + size_t i; + + for (i=0; i<num_fds; i++) { +@@ -392,7 +392,7 @@ static void messaging_recv_cb(struct tevent_context *e + private_data, struct messaging_context); + struct server_id_buf idbuf; + struct messaging_rec rec; +- int64_t fds64[MIN(num_fds, INT8_MAX)]; ++ int64_t fds64[MAX(1, MIN(num_fds, INT8_MAX))]; + size_t i; + + if (msg_len < MESSAGE_HDR_LENGTH) { +@@ -1348,7 +1348,7 @@ static void messaging_dispatch_rec(struct messaging_co + + if (ev != msg_ctx->event_ctx) { + struct iovec iov; +- int fds[rec->num_fds]; ++ int fds[MAX(1, rec->num_fds)]; + int ret; + + /* diff --git a/net/samba412/Makefile b/net/samba412/Makefile index f5d1434ba4d6..8b2e336f81d4 100644 --- a/net/samba412/Makefile +++ b/net/samba412/Makefile @@ -3,7 +3,7 @@ PORTNAME= ${SAMBA4_BASENAME}412 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} diff --git a/net/samba412/files/patch-source3_lib_messages.c b/net/samba412/files/patch-source3_lib_messages.c new file mode 100644 index 000000000000..2b6a06139fcb --- /dev/null +++ b/net/samba412/files/patch-source3_lib_messages.c @@ -0,0 +1,29 @@ +--- source3/lib/messages.c.orig 2020-02-28 08:59:35 UTC ++++ source3/lib/messages.c +@@ -157,7 +157,7 @@ struct messaging_rec *messaging_rec_create( + + { + struct messaging_rec rec; +- int64_t fds64[num_fds]; ++ int64_t fds64[MAX(1, num_fds)]; + size_t i; + + for (i=0; i<num_fds; i++) { +@@ -391,7 +391,7 @@ static void messaging_recv_cb(struct tevent_context *e + private_data, struct messaging_context); + struct server_id_buf idbuf; + struct messaging_rec rec; +- int64_t fds64[MIN(num_fds, INT8_MAX)]; ++ int64_t fds64[MAX(1, MIN(num_fds, INT8_MAX))]; + size_t i; + + if (msg_len < MESSAGE_HDR_LENGTH) { +@@ -1375,7 +1375,7 @@ static void messaging_dispatch_rec(struct messaging_co + + if (ev != msg_ctx->event_ctx) { + struct iovec iov; +- int fds[rec->num_fds]; ++ int fds[MAX(1, rec->num_fds)]; + int ret; + + /* diff --git a/net/samba413/Makefile b/net/samba413/Makefile index e1caa13c061a..dfc44d6b0520 100644 --- a/net/samba413/Makefile +++ b/net/samba413/Makefile @@ -3,7 +3,7 @@ PORTNAME= ${SAMBA4_BASENAME}413 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} diff --git a/net/samba413/files/patch-source3_lib_messages.c b/net/samba413/files/patch-source3_lib_messages.c new file mode 100644 index 000000000000..8d62f956dc2a --- /dev/null +++ b/net/samba413/files/patch-source3_lib_messages.c @@ -0,0 +1,29 @@ +--- source3/lib/messages.c.orig 2020-07-09 09:33:56 UTC ++++ source3/lib/messages.c +@@ -157,7 +157,7 @@ struct messaging_rec *messaging_rec_create( + + { + struct messaging_rec rec; +- int64_t fds64[num_fds]; ++ int64_t fds64[MAX(1, num_fds)]; + size_t i; + + for (i=0; i<num_fds; i++) { +@@ -391,7 +391,7 @@ static void messaging_recv_cb(struct tevent_context *e + private_data, struct messaging_context); + struct server_id_buf idbuf; + struct messaging_rec rec; +- int64_t fds64[MIN(num_fds, INT8_MAX)]; ++ int64_t fds64[MAX(1, MIN(num_fds, INT8_MAX))]; + size_t i; + + if (msg_len < MESSAGE_HDR_LENGTH) { +@@ -1371,7 +1371,7 @@ static void messaging_dispatch_rec(struct messaging_co + + if (ev != msg_ctx->event_ctx) { + struct iovec iov; +- int fds[rec->num_fds]; ++ int fds[MAX(1, rec->num_fds)]; + int ret; + + /* |