From nobody Sun Apr 21 07:34:10 2024 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 4VMg9t31vZz5HhCv; Sun, 21 Apr 2024 07:34:10 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VMg9t23jzz4b8J; Sun, 21 Apr 2024 07:34:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713684850; 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=ZJNiHt5ruxBQMIMvPm++n/lzEZag8uC28zfFbhlRWjc=; b=haCKIKcy/lKqTuqmaqOCwFsthm2NcrrLQFqcqVaDcfjcLJHMF52T3jHjbEN5zTEqZjHcwZ 9dlfVfX4aZ8dfmhjjDMXdL6XHj8w3CMfkSEvY4QZSdnLfIysBBr2EzWTfpUBVIftnk8lKR 5H51+O4Wbma/ZlXpr9seEoG/5DvqkLM23Btzu4XHgcH/73mC+mUdOTcDEjfobtNhf/jP20 fTSrwyzeA8NUU7yTO/x0PngBkEo2atY0Csb/PI0DZ714rQu03sHfk+B8lOGuq82JCuNzQ6 Fk+uZNrKtwaucWDsKKZctXkaY9BdAt6OEoAbdwA+j7YS8+XfNB9MfoE5yxcKtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713684850; a=rsa-sha256; cv=none; b=YNk7W0ZX521NmsiWee1acBkMUEdhugAZmx1mnxYqLnpdjGpJs3GM2eYzndKwX/Tr4JNSiJ vRREDDZCv5dla2mn1AESUz3EYFnxfiIHUTl0Ih/m6CvgiLqWeNyh9/ru+kN58BsCWgI1I9 /zzmKr7DZrqlNluXknA/kpiPj3wDreLPbgFtlBvSKq79SKSEWKVBRoULs3ss3S5XXz3mfC w5dat4ob9LazHsMdBA9HIURgfe0sX5YUp5XfnceLd6ksFgyK7oTCBmw1wqu77X+ZYZjnQs BlJ9kHMIlvTuuVVfVs3KrILVIQW2DJu1ifBRBLLiGxLez1R2/APOcu3MrQPhyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713684850; 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=ZJNiHt5ruxBQMIMvPm++n/lzEZag8uC28zfFbhlRWjc=; b=i73tTBDfECslsL5D2cofsJUfo5vzK7wNk5nHkPH/wXyTJSJIByYoVTRdMgBSU0BP8XNSTi shSEIbbd+mb5Y/jiu8/I+aaByqWOKdK2EX1rakOh2w7ikqi5n64wu2+YI63MuXx+26cTCN Ja3vftExT+1RT89TfWJ/uNqwd9e849F2Ghx9FvHJL6+hijg5BjMb/h6EKBllKbJAVlVPYW tZhri1TBt4jtDsLpGOBSw/E0q8lnWWF1EZXAi+9tcOhfDSJj3bvqNSGHL6diu2+u6B5XJZ HJ2WbIEKOhTQ6eww9kM47QCy80ybRYYQq/oTKeK7sXV4hPA9u3owYRfcLQ+Q/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VMg9t1gmHz1BVn; Sun, 21 Apr 2024 07:34:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43L7YADk054413; Sun, 21 Apr 2024 07:34:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43L7YAJ5054410; Sun, 21 Apr 2024 07:34:10 GMT (envelope-from git) Date: Sun, 21 Apr 2024 07:34:10 GMT Message-Id: <202404210734.43L7YAJ5054410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: bf2582cf15f5 - stable/14 - netpfil: Fix typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bf2582cf15f5250b3cdf1ad405b0ff8ea9b83dd7 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=bf2582cf15f5250b3cdf1ad405b0ff8ea9b83dd7 commit bf2582cf15f5250b3cdf1ad405b0ff8ea9b83dd7 Author: Gordon Bergling AuthorDate: 2024-04-18 14:17:10 +0000 Commit: Gordon Bergling CommitDate: 2024-04-21 07:33:02 +0000 netpfil: Fix typos in source code comments - s/addres/address/ (cherry picked from commit 8ce3ef5f35fd4dc442b1a33605ca7d3132047faf) --- sys/netpfil/ipfilter/netinet/ip_fil.h | 4 ++-- sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c | 2 +- sys/netpfil/pf/pf.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_fil.h b/sys/netpfil/ipfilter/netinet/ip_fil.h index 3db2b23512ef..7343fd079564 100644 --- a/sys/netpfil/ipfilter/netinet/ip_fil.h +++ b/sys/netpfil/ipfilter/netinet/ip_fil.h @@ -593,8 +593,8 @@ typedef struct fripf { u_short fri_icmp; frtuc_t fri_tuc; - fr_atypes_t fri_satype; /* addres type */ - fr_atypes_t fri_datype; /* addres type */ + fr_atypes_t fri_satype; /* address type */ + fr_atypes_t fri_datype; /* address type */ int fri_sifpidx; /* doing dynamic addressing */ int fri_difpidx; /* index into fr_ifps[] to use when */ } fripf_t; diff --git a/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c b/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c index 8f1ee3d8d05f..3bc74247251a 100644 --- a/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c +++ b/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c @@ -1834,7 +1834,7 @@ ipf_p_ftp_epsv(ipf_ftp_softc_t *softf, fr_info_t *fin, ip_t *ip, nat_t *nat, s++; /* - * As per RFC 2428, there are no addres components in the EPSV + * As per RFC 2428, there are no address components in the EPSV * response. So we'll go straight to getting the port. */ while (*s && ISDIGIT(*s)) { diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index b0b0a02afaf4..5fc234c5aca9 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6154,7 +6154,7 @@ again: break; } - /* Only add the addres if we've actually allowed the state. */ + /* Only add the address if we've actually allowed the state. */ pf_sctp_multihome_add_addr(pd, &j->src, v_tag); if (! do_extra) {