From nobody Thu Nov 05 15:12:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jL5QB2srfz709rF for ; Thu, 05 Nov 2026 15:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jL5Q95hKYz4CLw for ; Thu, 05 Nov 2026 15:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qwlkcl5hC6q0avxCWCBoNXID24pdUXGFF9xSy7Qu4Co=; b=LeyRqOmPEnB2BPnEPSvc6effKPTwTaw9OGDgvymws3r3CHbcdXCPqPRNUGVKv0b0EUpzBj eAJQiuXVs+s1SQpYclnwwMqM2cZxMv+j/ZOi2nYHluO4EgfAqS6mMabPXIbS83i0eQRw77 +IlAPSi1N2zWlWzmqmR4+bmsB4TJTTjUnGoEwDPY4VeO64FE7AvQ3J9uzjLFLLfRjkNgIs sQZQvERLlRcMM5o9XRU7Eq8n+vcVy4XWZAuJOha3irobmVkkVtLJ7k0gSSXDoWQJPV2wJ9 FZ2GPf4l03lXYAcgJMoSZNoipLFUI6NDMF6f5n4vq9a1gPUdJ/mHCDi2LqrBWQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793891537; b=ABtnt9Uc777bDZRAWNLThKIP0DGVozHWgCy4j2ZRfwF1V9bwHZ3dR3e3yDobv46w2D5OI2 sx+0qUAyYfVAb5dXYvzL3UaFxBikW8DPHBnSTD2lZ6f9Z9R5cjkNmizhckat6T8Ulv8JtL L+PucZAdyV8IOl0NZCRnES4LTWgFi8BXGlsEJQQQ1ir1NZGD33YT2jLeUuigwGJWX1LcZB nDU/rEUOkMZCe8WnY20d5F4wYcqSkqzXvTbvJN8qrmEzbYdbsnzsW+apsVyPt6IGL+qHmS /qjGZtInBiJ182HydZ/TyjdwEO1Y80GVx96zxdPkfmNZe6cyrkfNYninG4RdcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793891537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qwlkcl5hC6q0avxCWCBoNXID24pdUXGFF9xSy7Qu4Co=; b=cGUwwtvS/tCqSgtm4ENFUQ1727Or9eFzDgz1ZxPG7EbM2ks0cuEyQywivOO30iHKezx2OP Im958qCOYgg1dbJpWbuakFVVaa09haXDwKZhnbNzsLHhSX0R2/h8R63Xyvd5rsVLZ5XLcf XasxDK7O33QtvrmRbW+NBJUtvqMakTM0riAbObHNlDDnWV5B/i+7HSAZjdOOcBITT3dJyb D+KA0O6QV6BQ5r6cjz4kL9bpJdNkIgIZILN15zh0zcA3KCdUgeHsi06APtDMhW0sFVra9A vEVXTLCugPQtanhm3oozwc4JS8pzEj3pJI2uO5dc3UOwTJPEeaXYjkYkOZIthg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jL5Q955zmzwNZ for ; Thu, 05 Nov 2026 15:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 246a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 15:12:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 72ebe324d09e - stable/15 - auditdistd: Use void pointers for opaque data List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 72ebe324d09e778f0b86c4204a4bfdb4b089ff3d Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 15:12:17 +0000 Message-Id: <6aec9cd1.246a1.102f6178@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=72ebe324d09e778f0b86c4204a4bfdb4b089ff3d commit 72ebe324d09e778f0b86c4204a4bfdb4b089ff3d Author: Dag-Erling Smørgrav AuthorDate: 2026-10-20 13:28:37 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-05 15:11:52 +0000 auditdistd: Use void pointers for opaque data Use void, not char, for pointers to opaque data in our send and receive functions. Sponsored by: Klara, Inc. Sponsored by: Qualys, Inc. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D60728 (cherry picked from commit 4f19e4aca4f4b7a3058be5d3bfc5aed66668b00f) auditdistd: Fix build failure Fixes: 4f19e4aca4f4 ("auditdistd: Use void pointers for opaque data") Reported by: garga@ (cherry picked from commit 0ce9d6e240a14d5b7cd8eb45a83d0e429f4a3edf) --- contrib/openbsm/bin/auditdistd/proto_common.c | 6 +++--- contrib/openbsm/bin/auditdistd/proto_impl.h | 8 ++++---- contrib/openbsm/bin/auditdistd/proto_socketpair.c | 4 ++-- contrib/openbsm/bin/auditdistd/proto_tcp.c | 4 ++-- contrib/openbsm/bin/auditdistd/proto_tls.c | 4 ++-- contrib/openbsm/bin/auditdistd/proto_uds.c | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/contrib/openbsm/bin/auditdistd/proto_common.c b/contrib/openbsm/bin/auditdistd/proto_common.c index acd2294e2d93..30db25dc9f91 100644 --- a/contrib/openbsm/bin/auditdistd/proto_common.c +++ b/contrib/openbsm/bin/auditdistd/proto_common.c @@ -89,7 +89,7 @@ proto_descriptor_send(int sock, int fd) } int -proto_common_send(int sock, const unsigned char *data, size_t size, int fd) +proto_common_send(int sock, const void *data, size_t size, int fd) { ssize_t done; size_t sendsize; @@ -145,7 +145,7 @@ proto_common_send(int sock, const unsigned char *data, size_t size, int fd) errno = ETIMEDOUT; return (errno); } - data += done; + data = (const char *)data + done; size -= done; } while (size > 0); if (errcount > 0) { @@ -190,7 +190,7 @@ proto_descriptor_recv(int sock, int *fdp) } int -proto_common_recv(int sock, unsigned char *data, size_t size, int *fdp) +proto_common_recv(int sock, void *data, size_t size, int *fdp) { ssize_t done; diff --git a/contrib/openbsm/bin/auditdistd/proto_impl.h b/contrib/openbsm/bin/auditdistd/proto_impl.h index 7b6a273313c9..a6850b14611b 100644 --- a/contrib/openbsm/bin/auditdistd/proto_impl.h +++ b/contrib/openbsm/bin/auditdistd/proto_impl.h @@ -44,8 +44,8 @@ typedef int prt_connect_wait_t(void *, int); typedef int prt_server_t(const char *, void **); typedef int prt_accept_t(void *, void **); typedef int prt_wrap_t(int, bool, void **); -typedef int prt_send_t(void *, const unsigned char *, size_t, int); -typedef int prt_recv_t(void *, unsigned char *, size_t, int *); +typedef int prt_send_t(void *, const void *, size_t, int); +typedef int prt_recv_t(void *, void *, size_t, int *); typedef int prt_descriptor_t(const void *); typedef bool prt_address_match_t(const void *, const char *); typedef void prt_local_address_t(const void *, char *, size_t); @@ -76,7 +76,7 @@ void proto_register(struct proto *proto, bool isdefault); int proto_wrap(const char *protoname, bool client, int fd, struct proto_conn **newconnp); -int proto_common_send(int sock, const unsigned char *data, size_t size, int fd); -int proto_common_recv(int sock, unsigned char *data, size_t size, int *fdp); +int proto_common_send(int sock, const void *data, size_t size, int fd); +int proto_common_recv(int sock, void *data, size_t size, int *fdp); #endif /* !_PROTO_IMPL_H_ */ diff --git a/contrib/openbsm/bin/auditdistd/proto_socketpair.c b/contrib/openbsm/bin/auditdistd/proto_socketpair.c index 96fc39ebed57..20f6db9d01ab 100644 --- a/contrib/openbsm/bin/auditdistd/proto_socketpair.c +++ b/contrib/openbsm/bin/auditdistd/proto_socketpair.c @@ -110,7 +110,7 @@ sp_wrap(int fd, bool client, void **ctxp) } static int -sp_send(void *ctx, const unsigned char *data, size_t size, int fd) +sp_send(void *ctx, const void *data, size_t size, int fd) { struct sp_ctx *spctx = ctx; int sock; @@ -149,7 +149,7 @@ sp_send(void *ctx, const unsigned char *data, size_t size, int fd) } static int -sp_recv(void *ctx, unsigned char *data, size_t size, int *fdp) +sp_recv(void *ctx, void *data, size_t size, int *fdp) { struct sp_ctx *spctx = ctx; int sock; diff --git a/contrib/openbsm/bin/auditdistd/proto_tcp.c b/contrib/openbsm/bin/auditdistd/proto_tcp.c index 465221dfe5cc..80d64b23cd1d 100644 --- a/contrib/openbsm/bin/auditdistd/proto_tcp.c +++ b/contrib/openbsm/bin/auditdistd/proto_tcp.c @@ -494,7 +494,7 @@ tcp_wrap(int fd, bool client, void **ctxp) } static int -tcp_send(void *ctx, const unsigned char *data, size_t size, int fd) +tcp_send(void *ctx, const void *data, size_t size, int fd) { struct tcp_ctx *tctx = ctx; @@ -510,7 +510,7 @@ tcp_send(void *ctx, const unsigned char *data, size_t size, int fd) } static int -tcp_recv(void *ctx, unsigned char *data, size_t size, int *fdp) +tcp_recv(void *ctx, void *data, size_t size, int *fdp) { struct tcp_ctx *tctx = ctx; diff --git a/contrib/openbsm/bin/auditdistd/proto_tls.c b/contrib/openbsm/bin/auditdistd/proto_tls.c index 3143d72fe513..fe7c85df24ae 100644 --- a/contrib/openbsm/bin/auditdistd/proto_tls.c +++ b/contrib/openbsm/bin/auditdistd/proto_tls.c @@ -871,7 +871,7 @@ tls_wrap(int fd, bool client, void **ctxp) } static int -tls_send(void *ctx, const unsigned char *data, size_t size, int fd) +tls_send(void *ctx, const void *data, size_t size, int fd) { struct tls_ctx *tlsctx = ctx; @@ -890,7 +890,7 @@ tls_send(void *ctx, const unsigned char *data, size_t size, int fd) } static int -tls_recv(void *ctx, unsigned char *data, size_t size, int *fdp) +tls_recv(void *ctx, void *data, size_t size, int *fdp) { struct tls_ctx *tlsctx = ctx; diff --git a/contrib/openbsm/bin/auditdistd/proto_uds.c b/contrib/openbsm/bin/auditdistd/proto_uds.c index 3168bbf890b6..51db85af8843 100644 --- a/contrib/openbsm/bin/auditdistd/proto_uds.c +++ b/contrib/openbsm/bin/auditdistd/proto_uds.c @@ -228,7 +228,7 @@ uds_accept(void *ctx, void **newctxp) } static int -uds_send(void *ctx, const unsigned char *data, size_t size, int fd) +uds_send(void *ctx, const void *data, size_t size, int fd) { struct uds_ctx *uctx = ctx; @@ -240,7 +240,7 @@ uds_send(void *ctx, const unsigned char *data, size_t size, int fd) } static int -uds_recv(void *ctx, unsigned char *data, size_t size, int *fdp) +uds_recv(void *ctx, void *data, size_t size, int *fdp) { struct uds_ctx *uctx = ctx;