git: 14fffd43061a - stable/13 - Remove reference to the pfctlinput2() from domain(9) after 237c1f932b.

[Dmitry Chagin]

The branch stable/13 has been updated by dchagin:

URL: https://cgit.FreeBSD.org/src/commit/?id=14fffd43061a65239303db1e0d14dd2cf858e02d

commit 14fffd43061a65239303db1e0d14dd2cf858e02d
Author:     Dmitry Chagin <dchagin at FreeBSD.org>
AuthorDate: 2021-04-13 21:40:20 +0000
Commit:     Dmitry Chagin <dchagin at FreeBSD.org>
CommitDate: 2021-04-20 21:33:43 +0000

    Remove reference to the pfctlinput2() from domain(9) after 237c1f932b.
    
    Reviewed by:            glebius
    Differential Revision:  https://reviews.freebsd.org/D29751
    
    (cherry picked from commit 86887853c39b0803009579e2b927bd67d524af63)
---
 ObsoleteFiles.inc       |  3 +++
 share/man/man9/Makefile |  1 -
 share/man/man9/domain.9 | 27 +--------------------------
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 4fd7275fb8fa..761d5f61dadd 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -36,6 +36,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20210413: Remove pfctlinput2
+OLD_FILES+=usr/share/man/man9/pfctlinput2.9.gz
+
 # 20210329: Remove kernel-only crypto headers from /usr/include
 OLD_FILES+=usr/include/crypto/_cryptodev.h
 OLD_FILES+=usr/include/crypto/cbc_mac.h
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index edb87de6a35f..d2c3e77fc60f 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1010,7 +1010,6 @@ MLINKS+=dnv.9 dnvlist.9 \
 MLINKS+=domain.9 DOMAIN_SET.9 \
 	domain.9 domain_add.9 \
 	domain.9 pfctlinput.9 \
-	domain.9 pfctlinput2.9 \
 	domain.9 pffinddomain.9 \
 	domain.9 pffindproto.9 \
 	domain.9 pffindtype.9
diff --git a/share/man/man9/domain.9 b/share/man/man9/domain.9
index d8dca08c8dab..e8f97253a1d4 100644
--- a/share/man/man9/domain.9
+++ b/share/man/man9/domain.9
@@ -26,13 +26,12 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 29, 2020
+.Dd April 13, 2021
 .Dt DOMAIN 9
 .Os
 .Sh NAME
 .Nm domain_add ,
 .Nm pfctlinput ,
-.Nm pfctlinput2 ,
 .Nm pffinddomain ,
 .Nm pffindproto ,
 .Nm pffindtype ,
@@ -47,8 +46,6 @@
 .Fn domain_add "void *data"
 .Ft void
 .Fn pfctlinput "int cmd" "struct sockaddr *sa"
-.Ft void
-.Fn pfctlinput2 "int cmd" "struct sockaddr *sa" "void *ctlparam"
 .Ft struct domain *
 .Fn pffinddomain "int family"
 .Ft struct protosw *
@@ -130,27 +127,6 @@ calls the protocol specific
 .Fn pr_ctlinput
 function for each protocol in that has defined one, in every domain.
 .Pp
-.Fn pfctlinput2
-provides that same functionality of
-.Fn pfctlinput ,
-but with a few additional checks and a new
-.Vt "void *"
-argument that is passed directly to the protocol's
-.Fn pr_ctlinput
-function.
-Unlike
-.Fn pfctlinput ,
-.Fn pfctlinput2
-verifies that
-.Fa sa
-is not
-.Dv NULL ,
-and that only the protocol families that are the same as
-.Fa sa
-have their
-.Fn pr_ctlinput
-function called.
-.Pp
 .Fn domain_add
 adds a new protocol domain to the system.
 The argument
@@ -240,7 +216,6 @@ types if the domain has a default raw protocol.
 The functions
 .Fn domain_add ,
 .Fn pfctlinput ,
-.Fn pfctlinput2 ,
 .Fn pffinddomain ,
 .Fn pffindproto ,
 .Fn pffindtype