[illumos-gate merge]release-20200827

commit dbe930bf51e0d7458b24d30e9f25756c5da54ddf
    13040 grep can leverage bmg in more cases
commit 81dd18d87c3c2e198d2178dfd1f30d62a81b69ea
    3546 add support for grep -o option
commit 8ccd021704a4fe1b4022c110d3dd497f8cd907d5
    13038 grep could support --label
commit 2e5ac464a5683c5bf11439ccad74c9f279051820
    13037 grep could support -L
commit f415aa8f1340638644c6cf63e9d11d3767f4cbba
    13036 grep tests could be easier to extend
commit cd94aa947d1e02a1c25259f2cf06c165d75aa4fa
    13061 Import sed tests from freebsd
commit c6fc7f7b786ce47c35645054cdce73e83f39e7f3
    13051 sed: lastline check does not work properly with empty files
commit e0721d5ae1542c80097f6fcd487736fdfe601233
    13003 console: multiple issues related to colors and font loading and switching
commit 6863ede29751efd2be66ec1b48c3c0ee705d7d61
    13066 Want crontab -u
commit 31c9b836861e74f837a36ca29220b58f3657585a
    13044 Clarify parts of getopt_long(3C)
commit 9fff840dca14d75459a8240b19c931e2fec186c5
    13032 printf(3C) should talk about NULL string pointers

	Conflicts:
	usr/src/test/util-tests/tests/grep_xpg4/grep_test.ksh
	usr/src/man/man1/crontab.1
	usr/src/cmd/cron/crontab.c

1 files changed, 45 insertions, 45 deletions

diff --git a/usr/src/man/man1/crontab.1 b/usr/src/man/man1/crontab.1
index c954036653..d48b995045 100644
--- a/usr/src/man/man1/crontab.1
+++ b/usr/src/man/man1/crontab.1
@@ -45,29 +45,24 @@
 .\" Copyright (c) 2011, Joyent, Inc. All Rights Reserved
 .\" Portions Copyright (c) 1992, X/Open Company Limited All Rights Reserved
 .\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved
-.\" Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+.\" Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
 .\"
-.TH CRONTAB 1 "Oct 22, 2019"
+.TH CRONTAB 1 "Aug 20, 2020"
 .SH NAME
 crontab \- user crontab file
 .SH SYNOPSIS
 .nf
-\fB/usr/bin/crontab\fR [\fIfilename\fR]
+\fB/usr/bin/crontab\fR [\fB-u\fR \fIusername\fR] [\fIfilename\fR]
 .fi
 
 .LP
 .nf
-\fB/usr/bin/crontab\fR \fB-e\fR [\fIusername\fR]
+\fB/usr/bin/crontab\fR \fB{ -e | -l | -r }\fR [\fIusername\fR]
 .fi
 
 .LP
 .nf
-\fB/usr/bin/crontab\fR \fB-l\fR [\fB-g\fR] [\fIusername\fR]
-.fi
-
-.LP
-.nf
-\fB/usr/bin/crontab\fR \fB-r\fR [\fIusername\fR]
+\fB/usr/bin/crontab\fR \fB-u\fR \fIusername\fR \fB{ -e | -g | -l | -r }\fR
 .fi
 
 .LP
@@ -77,17 +72,12 @@ crontab \- user crontab file
 
 .LP
 .nf
-\fB/usr/xpg4/bin/crontab\fR \fB-e\fR [\fIusername\fR]
+\fB/usr/xpg4/bin/crontab\fR \fB{ -e | -g | -l | -r }\fR [\fIusername\fR]
 .fi
 
 .LP
 .nf
-\fB/usr/xpg4/bin/crontab\fR \fB-l\fR [\fB-g\fR] [\fIusername\fR]
-.fi
-
-.LP
-.nf
-\fB/usr/xpg4/bin/crontab\fR \fB-r\fR [\fIusername\fR]
+\fB/usr/xpg4/bin/crontab\fR \fB-u\fR \fIusername\fR \fB{ -e | -l | -r }\fR
 .fi
 
 .LP
@@ -97,17 +87,12 @@ crontab \- user crontab file
 
 .LP
 .nf
-\fB/usr/xpg6/bin/crontab\fR \fB-e\fR [\fIusername\fR]
-.fi
-
-.LP
-.nf
-\fB/usr/xpg6/bin/crontab\fR \fB-l\fR [\fB-g\fR] [\fIusername\fR]
+\fB/usr/xpg6/bin/crontab\fR \fB{ -e | -g | -l | -r }\fR [\fIusername\fR]
 .fi
 
 .LP
 .nf
-\fB/usr/xpg6/bin/crontab\fR \fB-r\fR [\fIusername\fR]
+\fB/usr/xpg6/bin/crontab\fR \fB-u\fR \fIusername\fR \fB{ -e | -l | -r }\fR
 .fi
 
 .SH DESCRIPTION
@@ -119,7 +104,8 @@ users' crontabs.
 .sp
 .LP
 If \fBcrontab\fR is invoked with \fIfilename\fR, this overwrites an existing
-\fBcrontab\fR entry for the user that invokes it.
+\fBcrontab\fR entry for the user that invokes it, or for the user specified
+with the \fB-u\fR option.
 .sp
 .LP
 Cron supports a merged crontab with entries coming from either the user's
@@ -131,6 +117,8 @@ be customized by the user.  The dual set of crontab entries is only
 of interest to system-defined users such as \fBroot\fR.  Except where
 otherwise explicitly indicated, all variants of the \fBcrontab\fR command
 act only on the editable crontab files found in \fB/var/spool/cron/crontabs\fR.
+.sp
+.LP
 .SS "\fBcrontab\fR Access Control"
 Users: Access to \fBcrontab\fR is allowed:
 .RS +4
@@ -285,11 +273,11 @@ The following variables are supported:
 .sp
 .ne 2
 .na
-\fB\fBHOME\fR\fR
+\fBHOME\fR
 .ad
 .sp .6
 .RS 4n
-Allows the user to choose and alternative directory for cron to change
+Allows the user to choose an alternative directory for cron to change
 directory to prior to running the command. For example:
 .sp
 .in +2
@@ -304,7 +292,7 @@ HOME=/var/tmp
 .sp
 .ne 2
 .na
-\fB\fBSHELL\fR\fR
+\fBSHELL\fR
 .ad
 .sp .6
 .RS 4n
@@ -322,7 +310,7 @@ SHELL=/usr/bin/ksh
 .sp
 .ne 2
 .na
-\fB\fBTZ\fR\fR
+\fBTZ\fR
 .ad
 .sp .6
 .RS 4n
@@ -365,7 +353,7 @@ The following options are supported:
 .sp
 .ne 2
 .na
-\fB\fB-e\fR\fR
+\fB-e\fR
 .ad
 .RS 6n
 Edits a copy of the current user's \fBcrontab\fR file, or creates an empty file
@@ -392,7 +380,7 @@ editable.
 .sp
 .ne 2
 .na
-\fB\fB-l\fR\fR
+\fB-l\fR
 .ad
 .RS 6n
 Lists the \fBcrontab\fR file for the invoking user. Only root or a user with
@@ -419,7 +407,7 @@ also given.
 .sp
 .ne 2
 .na
-\fB\fB-r\fR\fR
+\fB-r\fR
 .ad
 .RS 6n
 Removes a user's \fBcrontab\fR from the \fBcrontab\fR directory. Only root or a
@@ -428,6 +416,18 @@ following the \fB-r\fR option to remove the \fBcrontab\fR file of the specified
 user.
 .RE
 
+.sp
+.ne 2
+.na
+\fB-u\fR \fIusername\fR
+.ad
+.RS 6n
+Specifies the name of the user whose \fBcrontab\fR is to be replaced, viewed or
+modified. This can only be done by root or by a user with the
+\fBsolaris.jobs.admin\fR authorization.
+
+.RE
+
 .SH EXAMPLES
 \fBExample 1 \fRCleaning up Core Files
 .sp
@@ -552,7 +552,7 @@ that affect the execution of \fBcrontab\fR: \fBLANG\fR, \fBLC_ALL\fR,
 .SS "\fB/usr/bin/crontab\fR"
 .ne 2
 .na
-\fB\fBEDITOR\fR\fR
+\fBEDITOR\fR
 .ad
 .RS 10n
 Determine the editor to be invoked when the \fB-e\fR option is specified. This
@@ -563,7 +563,7 @@ is overridden by the \fBVISUAL\fR environmental variable. The default editor is
 .sp
 .ne 2
 .na
-\fB\fBPATH\fR\fR
+\fBPATH\fR
 .ad
 .RS 10n
 The \fBPATH\fR in \fBcrontab\fR's environment specifies the search path used to
@@ -573,7 +573,7 @@ find the editor.
 .sp
 .ne 2
 .na
-\fB\fBVISUAL\fR\fR
+\fBVISUAL\fR
 .ad
 .RS 10n
 Determine the visual editor to be invoked when the \fB-e\fR option is
@@ -584,7 +584,7 @@ specified. If \fBVISUAL\fR is not specified, then the environment variable
 .SS "\fB/usr/xpg4/bin/crontab\fR"
 .ne 2
 .na
-\fB\fBEDITOR\fR\fR
+\fBEDITOR\fR
 .ad
 .RS 10n
 Determine the editor to be invoked when the \fB-e\fR option is specified. The
@@ -594,7 +594,7 @@ default editor is \fB/usr/xpg4/bin/vi\fR.
 .SS "\fB/usr/xpg6/bin/crontab\fR"
 .ne 2
 .na
-\fB\fBEDITOR\fR\fR
+\fBEDITOR\fR
 .ad
 .RS 10n
 Determine the editor to be invoked when the \fB-e\fR option is specified. The
@@ -606,7 +606,7 @@ The following exit values are returned:
 .sp
 .ne 2
 .na
-\fB\fB0\fR\fR
+\fB0\fR
 .ad
 .RS 6n
 Successful completion.
@@ -615,7 +615,7 @@ Successful completion.
 .sp
 .ne 2
 .na
-\fB\fB>0\fR\fR
+\fB>0\fR
 .ad
 .RS 6n
 An error occurred.
@@ -624,7 +624,7 @@ An error occurred.
 .SH FILES
 .ne 2
 .na
-\fB\fB/etc/cron.d\fR\fR
+\fB/etc/cron.d\fR
 .ad
 .RS 28n
 main cron directory
@@ -633,7 +633,7 @@ main cron directory
 .sp
 .ne 2
 .na
-\fB\fB/etc/cron.d/cron.allow\fR\fR
+\fB/etc/cron.d/cron.allow\fR
 .ad
 .RS 28n
 list of allowed users
@@ -642,7 +642,7 @@ list of allowed users
 .sp
 .ne 2
 .na
-\fB\fB/etc/default/cron\fR\fR
+\fB/etc/default/cron\fR
 .ad
 .RS 28n
 contains cron default settings
@@ -651,7 +651,7 @@ contains cron default settings
 .sp
 .ne 2
 .na
-\fB\fB/etc/cron.d/cron.deny\fR\fR
+\fB/etc/cron.d/cron.deny\fR
 .ad
 .RS 28n
 list of denied users
@@ -669,7 +669,7 @@ system spool area for \fBcrontab\fR
 .sp
 .ne 2
 .na
-\fB\fB/var/cron/log\fR\fR
+\fB/var/cron/log\fR
 .ad
 .RS 28n
 accounting information
@@ -678,7 +678,7 @@ accounting information
 .sp
 .ne 2
 .na
-\fB\fB/var/spool/cron/crontabs\fR\fR
+\fB/var/spool/cron/crontabs\fR
 .ad
 .RS 28n
 spool area for \fBcrontab\fR