Revert changes to give arguments to the .Bx macro.

This is intended for things like .Bx 4.3 to generate "4.3BSD" so
the argument ends up before the BSD, not after.  Just go back to
using "BSD authentication" and "BSD login classes" so fixmdoc.sh
can operate correctly.  Bug #861

diff --git a/doc/fixmdoc.sh b/doc/fixmdoc.sh
index a5c9b339920c1035fbaa9fa2e04f2df1a044089a..53bf64296270c00cc7eb19f49a123be63b5cfe89 100755 (executable)
--- a/doc/fixmdoc.sh
+++ b/doc/fixmdoc.sh
@@ -35,7 +35,7 @@ case "$OUTFILE" in
        if [ X"$BAMAN" != X"1" ]; then
                BA_FLAG='/^.*\n\.Op Fl a Ar type/{;N;/^.*\n\.Ek$/d;};'
                cat >>"$OUTFILE" <<-'EOF'
-                       /^\.It Fl a Ar type/,/\.Bx authentication \.$/d
+                       /^\.It Fl a Ar type/,/BSD authentication\.$/d
                EOF
        fi
 
@@ -44,11 +44,11 @@ case "$OUTFILE" in
        if [ X"$LCMAN" != X"1" ]; then
                LC_FLAG='/^.*\n\.Op Fl c Ar class/{;N;/^.*\n\.Ek$/d;};'
                cat >>"$OUTFILE" <<-'EOF'
-                       /^\.It Fl c Ar class/,/\.Bx login classes \.$/d
+                       /^\.It Fl c Ar class/,/BSD login classes\.$/d
                        /^\.Xr login_cap 3 ,$/d
-                       /^\.Bx login class$/ {
+                       /^BSD login class$/ {
                                N
-                               /^\.Bx login class\n\.It$/d
+                               /^BSD login class\n\.It$/d
                        }
                EOF
        fi
@@ -110,7 +110,7 @@ case "$OUTFILE" in
        # BSD login class
        if [ X"$LCMAN" != X"1" ]; then
                cat >>"$OUTFILE" <<-'EOF'
-                       /^\.No On Bx systems/,/\.$/d
+                       /^On BSD systems/,/\.$/d
                        /^\.It use_loginclass$/,/^by default\./d
                EOF
        fi

diff --git a/doc/sudo.man.in b/doc/sudo.man.in
index 08049cc57a925da09050399895eeca4e3610d640..aec7715181fe713747e2445f6ad716323b3cff11 100644 (file)
--- a/doc/sudo.man.in
+++ b/doc/sudo.man.in
@@ -190,9 +190,7 @@ will exit with an error.
 .RE
 .TP 12n
 \fB\-a\fR \fItype\fR, \fB\--auth-type\fR=\fItype\fR
-Use the specified
-BSD
-authentication
+Use the specified BSD authentication
 \fItype\fR
 when validating the user, if allowed by
 \fI/etc/login.conf\fR.
@@ -201,9 +199,7 @@ authentication methods by adding an
 \(lqauth-sudo\(rq
 entry in
 \fI/etc/login.conf\fR.
-This option is only available on systems that support
-BSD
-authentication.
+This option is only available on systems that support BSD authentication.
 .TP 12n
 \fB\-b\fR, \fB\--background\fR
 Run the given command in the background.
@@ -254,9 +250,7 @@ If the command is being run as a login shell, additional
 \fI/etc/login.conf\fR
 settings, such as the umask and environment variables, will
 be applied, if present.
-This option is only available on systems with
-BSD
-login classes.
+This option is only available on systems with BSD login classes.
 .TP 12n
 \fB\-E\fR, \fB\--preserve-env\fR
 Indicates to the security policy that the user wishes to

diff --git a/doc/sudo.mdoc.in b/doc/sudo.mdoc.in
index e54959ad027b0efa1f3f3d9dc825c899862a2c39..ebb05b146438ca58b72ef367d9ce5002f0eb31a6 100644 (file)
--- a/doc/sudo.mdoc.in
+++ b/doc/sudo.mdoc.in
@@ -18,7 +18,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd November 23, 2018
+.Dd October 27, 2018
 .Dt SUDO @mansectsu@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -172,8 +172,7 @@ If no askpass program is available,
 .Nm
 will exit with an error.
 .It Fl a Ar type , Fl -auth-type Ns = Ns Ar type
-Use the specified
-.Bx authentication
+Use the specified BSD authentication
 .Ar type
 when validating the user, if allowed by
 .Pa /etc/login.conf .
@@ -182,8 +181,7 @@ authentication methods by adding an
 .Dq auth-sudo
 entry in
 .Pa /etc/login.conf .
-This option is only available on systems that support
-.Bx authentication .
+This option is only available on systems that support BSD authentication.
 .It Fl b , -background
 Run the given command in the background.
 Note that it is not possible to use shell job control to manipulate
@@ -231,8 +229,7 @@ If the command is being run as a login shell, additional
 .Pa /etc/login.conf
 settings, such as the umask and environment variables, will
 be applied, if present.
-This option is only available on systems with
-.Bx login classes .
+This option is only available on systems with BSD login classes.
 .It Fl E , -preserve-env
 Indicates to the security policy that the user wishes to
 preserve their existing environment variables.
@@ -655,7 +652,7 @@ Solaris project
 .It
 Solaris privileges
 .It
-.Bx login class
+BSD login class
 .It
 scheduling priority (aka nice value)
 .El

diff --git a/doc/sudoers.man.in b/doc/sudoers.man.in
index cfa420171f44ba85bdb9daf2dd839489d3da9e74..b345ec4b75b4aa8ef7260da4afa462c395986e51 100644 (file)
--- a/doc/sudoers.man.in
+++ b/doc/sudoers.man.in
@@ -292,9 +292,7 @@ systems without PAM), the environment is initialized with the
 contents of the
 \fI/etc/environment\fR
 file.
-On
-BSD
-systems, if the
+On BSD systems, if the
 \fIuse_loginclass\fR
 option is enabled, the environment is initialized
 based on the
@@ -485,9 +483,7 @@ systems without PAM), the contents of
 \fI/etc/environment\fR
 are also
 included.
-On
-BSD
-systems, if the
+On BSD systems, if the
 \fIuse_loginclass\fR
 flag is
 enabled, the

diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in
index 3256193e314741212980afd5d61918f769eae97e..c78ac7fd2d2d7be2835877a9a7f89a9989d819c2 100644 (file)
--- a/doc/sudoers.mdoc.in
+++ b/doc/sudoers.mdoc.in
@@ -18,7 +18,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd November 23, 2018
+.Dd October 27, 2018
 .Dt SUDOERS @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -282,7 +282,7 @@ systems without PAM), the environment is initialized with the
 contents of the
 .Pa /etc/environment
 file.
-.No On Bx systems , if the
+On BSD systems, if the
 .Em use_loginclass
 option is enabled, the environment is initialized
 based on the
@@ -470,7 +470,7 @@ systems without PAM), the contents of
 .Pa /etc/environment
 are also
 included.
-.No On Bx systems , if the
+On BSD systems, if the
 .Em use_loginclass
 flag is
 enabled, the