From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/ulm:pam_skey-1.1.5-patches-5 commit in: patchsets/pam_skey/1.1.5/
Date: Fri, 4 Sep 2015 08:33:25 +0000 (UTC) [thread overview]
Message-ID: <1360925888.ba0e647fae328593d1d4c12c91b9a819fc11241e.ulm@gentoo> (raw)
Message-ID: <20150904083325.gcBLVFnrdysXaEqEAko-kLB0qMMvVd8a8wIN6Y4RrWw@z> (raw)
commit: ba0e647fae328593d1d4c12c91b9a819fc11241e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 08:44:20 2012 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 15 10:58:08 2013 +0000
URL: https://gitweb.gentoo.org/dev/ulm.git/commit/?id=ba0e647f
Fix typos in documentation (PAM_AUTH_ERR not PAM_AUTHERR).
patchsets/pam_skey/1.1.5/01_all_gentoo.patch | 4 ++--
patchsets/pam_skey/1.1.5/02_all_require_skey.patch | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch
index d9562c8..df0b5f9 100644
--- a/patchsets/pam_skey/1.1.5/01_all_gentoo.patch
+++ b/patchsets/pam_skey/1.1.5/01_all_gentoo.patch
@@ -161,10 +161,10 @@
+ 5a. If an empty response is given, request the S/Key response again,
+ this time with input echoed.
+ 5b. If the response is a valid S/Key response, return PAM_SUCCESS.
-+ Otherwise, return PAM_AUTHERR.
++ Otherwise, return PAM_AUTH_ERR.
+6. If the response is a valid S/Key response, return PAM_SUCCESS.
+7. Otherwise, if no_default_skey is enabled (the user specifically
-+ requested "s/key" authentication), return PAM_AUTHERR.
++ requested "s/key" authentication), return PAM_AUTH_ERR.
+8. Otherwise, store the response as the authentication token and
+ return PAM_IGNORE.
+
diff --git a/patchsets/pam_skey/1.1.5/02_all_require_skey.patch b/patchsets/pam_skey/1.1.5/02_all_require_skey.patch
index 9e51362..c43029a 100644
--- a/patchsets/pam_skey/1.1.5/02_all_require_skey.patch
+++ b/patchsets/pam_skey/1.1.5/02_all_require_skey.patch
@@ -49,7 +49,7 @@ the module doesn't change.
return PAM_SUCCESS.
3a. If the token is invalid and use_first_pass is enabled, return
- PAM_IGNORE.
-+ PAM_IGNORE (or PAM_AUTHERR if require_skey is set).
++ PAM_IGNORE (or PAM_AUTH_ERR if require_skey is set).
4. If no_default_skey is enabled, issue a "Password: " prompt.
4a. If the response is anything besides "s/key" (case insensitive),
store it as the authentication token and return PAM_IGNORE.
@@ -63,13 +63,13 @@ the module doesn't change.
5a. If an empty response is given, request the S/Key response again,
this time with input echoed.
5b. If the response is a valid S/Key response, return PAM_SUCCESS.
- Otherwise, return PAM_AUTHERR.
+ Otherwise, return PAM_AUTH_ERR.
6. If the response is a valid S/Key response, return PAM_SUCCESS.
-7. Otherwise, if no_default_skey is enabled (the user specifically
-- requested "s/key" authentication), return PAM_AUTHERR.
+- requested "s/key" authentication), return PAM_AUTH_ERR.
+7. Otherwise, if no_default_skey is enabled (and the user specifically
+ requested "s/key" authentication), or if require_skey is enabled,
-+ return PAM_AUTHERR.
++ return PAM_AUTH_ERR.
8. Otherwise, store the response as the authentication token and
return PAM_IGNORE.
next reply other threads:[~2015-09-04 8:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-04 8:33 Ulrich Müller [this message]
2015-09-04 8:29 ` [gentoo-commits] dev/ulm:master commit in: patchsets/pam_skey/1.1.5/ Ulrich Müller
2015-09-04 8:33 ` [gentoo-commits] dev/ulm:motif-2.3.4-patches-1 " Ulrich Müller
2015-09-04 8:33 ` [gentoo-commits] dev/ulm:pam_skey-1.1.5-patches-5 " Ulrich Müller
2015-09-04 8:33 ` [gentoo-commits] dev/ulm:pam_skey-1.1.5-patches-4 " Ulrich Müller
2015-09-04 8:33 ` [gentoo-commits] dev/ulm:pam_skey-1.1.5-patches-6 " Ulrich Müller
2015-09-04 8:33 ` [gentoo-commits] dev/ulm:skey-1.1.5-patches-3 " Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2015-09-04 8:33 Ulrich Müller
2015-09-04 8:33 ` [gentoo-commits] dev/ulm:openmotif-2.2.3-patches-5 " Ulrich Müller
2015-09-04 8:33 [gentoo-commits] dev/ulm:skey-1.1.5-patches-2 " Ulrich Müller
2015-09-04 8:33 ` [gentoo-commits] dev/ulm:openmotif-2.2.3-patches-5 " Ulrich Müller
2015-09-04 8:33 [gentoo-commits] dev/ulm:pam_skey-1.1.5-patches-6 " Ulrich Müller
2015-09-04 8:33 ` [gentoo-commits] dev/ulm:openmotif-2.2.3-patches-5 " Ulrich Müller
2015-09-04 8:33 [gentoo-commits] dev/ulm:pam_skey-1.1.5-patches-4 " Ulrich Müller
2015-09-04 8:33 ` [gentoo-commits] dev/ulm:openmotif-2.2.3-patches-5 " Ulrich Müller
2015-09-04 8:29 [gentoo-commits] dev/ulm:master " Ulrich Müller
2015-09-04 8:33 ` [gentoo-commits] dev/ulm:openmotif-2.2.3-patches-5 " Ulrich Müller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1360925888.ba0e647fae328593d1d4c12c91b9a819fc11241e.ulm@gentoo \
--to=ulm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox