git: 18de44e7b442 - main - pfctl: fix man page and error message for -S option

The branch main has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=18de44e7b44209d94999523a93d83031e26a5719

commit 18de44e7b44209d94999523a93d83031e26a5719
Author:     Ross Williams <ross@ross-williams.net>
AuthorDate: 2026-04-17 15:20:18 +0000
Commit:     Kristof Provost <kp@FreeBSD.org>
CommitDate: 2026-04-20 12:50:40 +0000

    pfctl: fix man page and error message for -S option
    
    The `pfctl -S` flag was added to disable DNS resolution in
    <https://reviews.freebsd.org/D50724> but documentation and error
    messages refer to a `pfctl -N` flag for the same purpose. The `pfctl -N`
    flag performs an unrelated function, so the docs and error messages need
    to be changed. Caught this when revising documentation for the `-N`
    flag.
    
    Reviewed by:    kp
    Signed-off-by:  Ross Williams <ross@ross-williams.net>
---
 sbin/pfctl/pfctl.8 | 4 ++--
 sbin/pfctl/pfctl.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8
index 53f2c369108f..1e9ad5cc29bf 100644
--- a/sbin/pfctl/pfctl.8
+++ b/sbin/pfctl/pfctl.8
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd December 30, 2025
+.Dd April 20, 2026
 .Dt PFCTL 8
 .Os
 .Sh NAME
@@ -458,7 +458,7 @@ and
 flags to load multiple rule types without (re)loading all rules.
 .It Fl r
 Perform reverse DNS lookups on states and tables when displaying them.
-.Fl N
+.Fl S
 and
 .Fl r
 are mutually exclusive.
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index 48e6a053a842..e84e7f9272d4 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -3809,7 +3809,7 @@ main(int argc, char *argv[])
 	}
 
 	if ((opts & PF_OPT_NODNS) && (opts & PF_OPT_USEDNS))
-		errx(1, "-N and -r are mutually exclusive");
+		errx(1, "-S and -r are mutually exclusive");
 
 	if ((tblcmdopt == NULL) ^ (tableopt == NULL) &&
 	    (tblcmdopt == NULL || *tblcmdopt != 'l'))