summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormartijn <martijn@openbsd.org>2021-01-16 09:18:41 +0000
committermartijn <martijn@openbsd.org>2021-01-16 09:18:41 +0000
commit4d7faafbffd7efd0583a29f5f60750328d18d182 (patch)
treef4213ecd250229fd5992e32049929b9585d2ddb9
parentUpdate model details for Loongson Lynloong. (diff)
downloadwireguard-openbsd-4d7faafbffd7efd0583a29f5f60750328d18d182.tar.xz
wireguard-openbsd-4d7faafbffd7efd0583a29f5f60750328d18d182.zip
s/authorization/authentication/g
OK kn@ tedu@
-rw-r--r--usr.bin/doas/doas.16
-rw-r--r--usr.bin/doas/doas.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/doas/doas.1 b/usr.bin/doas/doas.1
index e673927de3e..4d2e09777c8 100644
--- a/usr.bin/doas/doas.1
+++ b/usr.bin/doas/doas.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: doas.1,v 1.24 2021/01/15 08:32:55 martijn Exp $
+.\" $OpenBSD: doas.1,v 1.25 2021/01/16 09:18:41 martijn 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: January 15 2021 $
+.Dd $Mdocdate: January 16 2021 $
.Dt DOAS 1
.Os
.Sh NAME
@@ -94,7 +94,7 @@ will be printed on standard output, depending on command
matching results.
No command is executed.
.It Fl L
-Clear any persisted authorizations from previous invocations,
+Clear any persisted authentications from previous invocations,
then immediately exit.
No command is executed.
.It Fl n
diff --git a/usr.bin/doas/doas.c b/usr.bin/doas/doas.c
index 0054f170bbb..12ccf25c970 100644
--- a/usr.bin/doas/doas.c
+++ b/usr.bin/doas/doas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: doas.c,v 1.85 2021/01/13 13:49:34 kn Exp $ */
+/* $OpenBSD: doas.c,v 1.86 2021/01/16 09:18:41 martijn Exp $ */
/*
* Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
*
@@ -215,7 +215,7 @@ authuser(char *myname, char *login_style, int persist)
if (!(as = auth_userchallenge(myname, login_style, "auth-doas",
&challenge)))
- errx(1, "Authorization failed");
+ errx(1, "Authentication failed");
if (!challenge) {
char host[HOST_NAME_MAX + 1];
if (gethostname(host, sizeof(host)))
@@ -235,7 +235,7 @@ authuser(char *myname, char *login_style, int persist)
explicit_bzero(rbuf, sizeof(rbuf));
syslog(LOG_AUTHPRIV | LOG_NOTICE,
"failed auth for %s", myname);
- errx(1, "Authorization failed");
+ errx(1, "Authentication failed");
}
explicit_bzero(rbuf, sizeof(rbuf));
good:
@@ -406,7 +406,7 @@ main(int argc, char **argv)
if (!(rule->options & NOPASS)) {
if (nflag)
- errx(1, "Authorization required");
+ errx(1, "Authentication required");
authuser(mypw->pw_name, login_style, rule->options & PERSIST);
}