diff --git a/etc/skel/dot.version b/etc/skel/dot.version index 8a32bb5c6..7e03aed98 100644 --- a/etc/skel/dot.version +++ b/etc/skel/dot.version @@ -1 +1 @@ -# SecBSD 1.4-d30837c: Mon Oct 2 02:35:45 UTC 2023 (Tezcatlipoca) +# SecBSD 1.4-37f6beb: Wed Oct 4 04:28:37 UTC 2023 (Tezcatlipoca) diff --git a/lib/libcrypto/man/IPAddressRange_new.3 b/lib/libcrypto/man/IPAddressRange_new.3 index 3195ebfa9..a812107cd 100644 --- a/lib/libcrypto/man/IPAddressRange_new.3 +++ b/lib/libcrypto/man/IPAddressRange_new.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: IPAddressRange_new.3,v 1.8 2023/10/01 08:23:58 tb Exp $ +.\" $OpenBSD: IPAddressRange_new.3,v 1.9 2023/10/03 09:58:06 tb Exp $ .\" .\" Copyright (c) 2023 Theo Buehler .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: October 1 2023 $ +.Dd $Mdocdate: October 3 2023 $ .Dt IPADDRESSRANGE_NEW 3 .Os .Sh NAME @@ -103,9 +103,9 @@ .Vt IPAddressChoice , and .Vt IPAddressFamily -are building blocks of the RFC 3779 +are building blocks of the .Vt IPAddrBlocks -type representing the IP address delegation extension. +type representing the RFC 3779 IP address delegation extension. .Pp Per RFC 3779, section 2.1.1, an IPv4 or an IPv6 address is encoded in network byte order in an @@ -183,7 +183,7 @@ The API uses for this. .Pp The -.Vt IpAddressOrRange +.Vt IPAddressOrRange type defined in RFC 3779 section 2.2.3.7 is implemented as .Bd -literal -offset indent typedef struct IPAddressOrRange_st { diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c index 61f1e0927..4f3875f20 100644 --- a/sys/net/if_pfsync.c +++ b/sys/net/if_pfsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.c,v 1.321 2023/09/16 09:33:27 mpi Exp $ */ +/* $OpenBSD: if_pfsync.c,v 1.322 2023/10/03 10:22:10 sthen Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff @@ -1537,6 +1537,7 @@ pfsync_sendout(struct pfsync_softc *sc, struct mbuf *m) imo.imo_ifidx = sc->sc_sync_ifidx; imo.imo_ttl = PFSYNC_DFLTTL; imo.imo_loop = 0; + m->m_pkthdr.ph_rtableid = sc->sc_if.if_rdomain; if (ip_output(m, NULL, NULL, IP_RAWOUTPUT, &imo, NULL, 0) == 0) { counters_pkt(sc->sc_if.if_counters, ifc_opackets, diff --git a/usr.bin/cu/cu.1 b/usr.bin/cu/cu.1 index 720be2d3c..2b03115e2 100644 --- a/usr.bin/cu/cu.1 +++ b/usr.bin/cu/cu.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cu.1,v 1.24 2023/10/02 23:38:11 krw Exp $ +.\" $OpenBSD: cu.1,v 1.25 2023/10/03 05:20:38 jmc Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: October 2 2023 $ +.Dd $Mdocdate: October 3 2023 $ .Dt CU 1 .Os .Sh NAME @@ -82,7 +82,6 @@ See .Xr sysctl 2 .Va hw.ucomnames for available USB serial lines. -.Pp .It Fl r Start .Nm diff --git a/usr.bin/ssh/PROTOCOL.agent b/usr.bin/ssh/PROTOCOL.agent index 44e463674..1c4841147 100644 --- a/usr.bin/ssh/PROTOCOL.agent +++ b/usr.bin/ssh/PROTOCOL.agent @@ -1,5 +1,5 @@ The SSH agent protocol is described in -https://tools.ietf.org/html/draft-miller-ssh-agent-04 +https://tools.ietf.org/html/draft-miller-ssh-agent This file documents OpenSSH's extensions to the agent protocol. @@ -81,4 +81,4 @@ the constraint is: This option is only valid for XMSS keys. -$OpenBSD: PROTOCOL.agent,v 1.19 2023/04/12 08:53:54 jsg Exp $ +$OpenBSD: PROTOCOL.agent,v 1.20 2023/10/03 23:56:10 djm Exp $