summaryrefslogtreecommitdiff
path: root/security/gvmd/files/patch-src_gvmd.c
diff options
context:
space:
mode:
authorJose Alonso Cardenas Marquez <acm@FreeBSD.org>2023-10-02 12:13:21 -0500
committerJose Alonso Cardenas Marquez <acm@FreeBSD.org>2023-10-02 12:18:12 -0500
commit11e2887006dbf3cfd9326a3d98bd89f308043c28 (patch)
tree995fdd05ca0ba0d070c52510e55e3f59d2dbaddb /security/gvmd/files/patch-src_gvmd.c
parentdevel/py-zclockfile: drop TEST_DEPENDS (diff)
security/gvm: update to 22.9.0
- databases/pg-gvm: update to 22.6.1 - security/gsa: update to 22.7.1 - security/gsad: update to 22.6.0 - security/gvm-libs: update to 22.7.1 - security/gvmd: update to 22.9.0 - security/openvas: update to 22.7.5 - security/py-gvm-tools: update to 23.9.0 - security/py-notus-scanner: update to 22.6.0 - security/py-ospd-openvas: update to 22.6.0 - security/py-python-gvm: update to 23.5.1
Diffstat (limited to 'security/gvmd/files/patch-src_gvmd.c')
-rw-r--r--security/gvmd/files/patch-src_gvmd.c55
1 files changed, 36 insertions, 19 deletions
diff --git a/security/gvmd/files/patch-src_gvmd.c b/security/gvmd/files/patch-src_gvmd.c
index f126c86db8e7..d0b589c108be 100644
--- a/security/gvmd/files/patch-src_gvmd.c
+++ b/security/gvmd/files/patch-src_gvmd.c
@@ -1,35 +1,44 @@
---- src/gvmd.c 2022-07-21 02:20:24.000000000 -0500
-+++ src/gvmd.c 2022-07-31 19:20:20.775975000 -0500
-@@ -1558,6 +1558,7 @@
+--- src/gvmd.c 2023-09-08 08:33:54.000000000 -0500
++++ src/gvmd.c 2023-09-20 22:04:48.265160000 -0500
+@@ -1558,6 +1558,9 @@
struct sockaddr_un address_unix;
struct sockaddr_storage address_tls;
int address_size;
++#if defined(__FreeBSD__)
+ socklen_t addrlen;
++#endif
memset (&address_tls, 0, sizeof (struct sockaddr_storage));
memset (&address_unix, 0, sizeof (struct sockaddr_un));
-@@ -1571,9 +1572,8 @@
+@@ -1571,10 +1574,14 @@
/* UNIX file socket. */
address_unix.sun_family = AF_UNIX;
-- strncpy (address_unix.sun_path,
-- address_str_unix,
-- sizeof (address_unix.sun_path) - 1);
-+ strcpy (address_unix.sun_path,
++#if defined(__FreeBSD__)
++ strcpy (address_unix.sun_path,
+ address_str_unix);
-
++#else
+ strncpy (address_unix.sun_path,
+ address_str_unix,
+ sizeof (address_unix.sun_path) - 1);
+-
++#endif
g_debug ("%s: address_unix.sun_path: %s",
__func__,
-@@ -1594,7 +1594,7 @@
+ address_unix.sun_path);
+@@ -1594,7 +1601,11 @@
}
address = (struct sockaddr *) &address_unix;
-- address_size = sizeof (address_unix);
++#if defined(__FreeBSD__)
+ addrlen = sizeof(struct sockaddr_un);
++#else
+ address_size = sizeof (address_unix);
++#endif
/* Ensure the path of the socket exists. */
-@@ -1610,8 +1610,8 @@
+@@ -1610,8 +1621,9 @@
}
else if (address_str_tls)
{
@@ -37,10 +46,11 @@
- struct sockaddr_in6 *addr6;
+ struct sockaddr_in *addr4 = (struct sockaddr_in *) &address_tls;
+ struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *) &address_tls;
++
int port, optval;
/* TLS TCP socket. */
-@@ -1636,17 +1636,17 @@
+@@ -1636,17 +1648,21 @@
port = htons (GVMD_PORT);
}
@@ -50,32 +60,39 @@
{
address_tls.ss_family = AF_INET6;
addr6->sin6_port = port;
-+ addrlen = sizeof (*addr6);
++#if defined(__FreeBSD__)
++ addrlen = sizeof (*addr6);
++#endif
}
else if (inet_pton (AF_INET, address_str_tls, &addr4->sin_addr) > 0)
{
address_tls.ss_family = AF_INET;
addr4->sin_port = port;
-+ addrlen = sizeof (*addr4);
++#if defined(__FreeBSD__)
++ addrlen = sizeof (*addr4);
++#endif
}
else
{
-@@ -1687,7 +1687,7 @@
+@@ -1687,7 +1703,11 @@
return -1;
}
-- if (bind (*soc, address, address_size) == -1)
++#if defined(__FreeBSD__)
+ if (bind (*soc, address, addrlen) == -1)
++#else
+ if (bind (*soc, address, address_size) == -1)
++#endif
{
g_warning ("Failed to bind manager socket: %s", strerror (errno));
return -1;
-@@ -2326,7 +2326,9 @@
+@@ -2378,7 +2398,9 @@
/* Set process title. */
+#if !defined(__FreeBSD__)
setproctitle_init (argc, argv, env);
+#endif
- setproctitle ("gvmd: Initializing");
+ setproctitle ("Initializing");
/* Setup initial signal handlers. */