Stop exiting on cmdline overflow: it's used only for logging, so aborting

[opendoas.git] / doas.1

diff --git a/doas.1 b/doas.1
index d2f94efd80889c042c74964035b74b155869270b..63153c618460b8ce63b3c0ef3e7f17176b5fa5ce 100644 (file)
--- a/doas.1
+++ b/doas.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD$
+.\" $OpenBSD: doas.1,v 1.10 2015/07/21 17:49:33 jmc Exp $
 .\"
 .\"Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
 .\"
@@ -13,7 +13,7 @@
 .\"WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 .\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.Dd $Mdocdate$
+.Dd $Mdocdate: July 21 2015 $
 .Dt DOAS 1
 .Os
 .Sh NAME
@@ -21,16 +21,48 @@
 .Nd execute commands as another user
 .Sh SYNOPSIS
 .Nm doas
+.Op Fl s
+.Op Fl C Ar config
 .Op Fl u Ar user
-command
+.Ar command
 .Op Ar args
 .Sh DESCRIPTION
 The
 .Nm
 utility executes the given command as another user.
+The
+.Ar command
+argument is mandatory unless
+.Fl C
+or
+.Fl s
+is specified.
 .Pp
 The options are as follows:
 .Bl -tag -width tenletters
+.It Fl C Ar config
+Parse and check the configuration file
+.Ar config ,
+then exit.
+If
+.Ar command
+is supplied,
+.Nm
+will also perform command matching.
+In the latter case
+either
+.Sq permit ,
+.Sq permit nopass
+or
+.Sq deny
+will be printed on standard output, depending on command
+matching results.
+No command is executed.
+.It Fl s
+Execute the shell from
+.Ev SHELL
+or
+.Pa /etc/passwd .
 .It Fl u Ar user
 Execute the command as
 .Ar user .
@@ -38,16 +70,22 @@ The default is root.
 .El
 .Sh EXIT STATUS
 .Ex -std doas
-It may fail because of one of the following reasons:
+It may fail for one of the following reasons:
 .Pp
 .Bl -bullet -compact
 .It
-The config file could not be parsed.
+The config file
+.Pa /etc/doas.conf
+could not be parsed.
+.It
+The user attempted to run a command which is not permitted.
 .It
-The user attempted an command which is not permitted.
+The password was incorrect.
 .It
-Entered passphrase is incorrect.
+The actual program is absent or not executable.
 .El
+.Sh SEE ALSO
+.Xr doas.conf 5
 .Sh HISTORY
 The
 .Nm