s/authorization/authentication/g

OK kn@ tedu@

diff --git a/doas.c b/doas.c
index d312b2471a6332a833829cd9148532a52a49e33f..b47d2bb8c7bbb7593c791b72471be9f144d7371b 100644 (file)
--- a/doas.c
+++ b/doas.c
@@ -352,7 +352,7 @@ main(int argc, char **argv)
 #if defined(USE_SHADOW)
        if (!(rule->options & NOPASS)) {
                if (nflag)
-                       errx(1, "Authorization required");
+                       errx(1, "Authentication required");
 
                shadowauth(mypw->pw_name, rule->options & PERSIST);
        }
@@ -360,7 +360,7 @@ main(int argc, char **argv)
        /* no authentication provider, only allow NOPASS rules */
        (void) nflag;
        if (!(rule->options & NOPASS))
-               errx(1, "Authorization required");
+               errx(1, "Authentication required");
 #endif
 
        if ((p = getenv("PATH")) != NULL)

diff --git a/pam.c b/pam.c
index 68294b275451c2e3ee9a88700b413114a261d748..a9e203658e1093b3d9b675e818205106d2672df2 100644 (file)
--- a/pam.c
+++ b/pam.c
@@ -245,7 +245,7 @@ pamauth(const char *user, const char *myname, int interactive, int nopass, int p
 #endif
 
        if (!user || !myname)
-               errx(1, "Authorization failed");
+               errx(1, "Authentication failed");
 
        ret = pam_start(PAM_SERVICE_NAME, myname, &conv, &pamh);
        if (ret != PAM_SUCCESS)
@@ -277,7 +277,7 @@ pamauth(const char *user, const char *myname, int interactive, int nopass, int p
 
        if (!nopass) {
                if (!interactive)
-                       errx(1, "Authorization required");
+                       errx(1, "Authentication required");
 
                /* doas style prompt for pam */
                char host[HOST_NAME_MAX + 1];
@@ -291,7 +291,7 @@ pamauth(const char *user, const char *myname, int interactive, int nopass, int p
                if (ret != PAM_SUCCESS) {
                        pamcleanup(ret, sess, cred);
                        syslog(LOG_AUTHPRIV | LOG_NOTICE, "failed auth for %s", myname);
-                       errx(1, "Authorization failed");
+                       errx(1, "Authentication failed");
                }
        }
 
@@ -304,7 +304,7 @@ pamauth(const char *user, const char *myname, int interactive, int nopass, int p
        if (ret != PAM_SUCCESS) {
                pamcleanup(ret, sess, cred);
                syslog(LOG_AUTHPRIV | LOG_NOTICE, "failed auth for %s", myname);
-               errx(1, "Authorization failed");
+               errx(1, "Authentication failed");
        }
 
        /* set PAM_USER to the user we want to be */

diff --git a/shadow.c b/shadow.c
index 27053d3a5ac5aae941867b6409910ee5dcfc9d2f..2569b586635646a79fe0d818c9ff5c66e08a1e24 100644 (file)
--- a/shadow.c
+++ b/shadow.c
@@ -68,10 +68,10 @@ shadowauth(const char *myname, int persist)
        if (hash[0] == 'x' && hash[1] == '\0') {
                struct spwd *sp;
                if ((sp = getspnam(myname)) == NULL)
-                       errx(1, "Authorization failed");
+                       errx(1, "Authentication failed");
                hash = sp->sp_pwdp;
        } else if (hash[0] != '*') {
-               errx(1, "Authorization failed");
+               errx(1, "Authentication failed");
        }
 
        char host[HOST_NAME_MAX + 1];
@@ -91,12 +91,12 @@ shadowauth(const char *myname, int persist)
                err(1, "readpassphrase");
        if ((encrypted = crypt(response, hash)) == NULL) {
                explicit_bzero(rbuf, sizeof(rbuf));
-               errx(1, "Authorization failed");
+               errx(1, "Authentication failed");
        }
        explicit_bzero(rbuf, sizeof(rbuf));
        if (strcmp(encrypted, hash) != 0) {
                syslog(LOG_AUTHPRIV | LOG_NOTICE, "failed auth for %s", myname);
-               errx(1, "Authorization failed");
+               errx(1, "Authentication failed");
        }
 
 #ifdef USE_TIMESTAMP