From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 626321399E6 for ; Fri, 4 Sep 2015 08:36:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 592B695860; Fri, 4 Sep 2015 08:33:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E0BE143C9 for ; Fri, 4 Sep 2015 08:33:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9BBF2340A2B for ; Fri, 4 Sep 2015 08:33:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 928181B3 for ; Fri, 4 Sep 2015 08:33:29 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1360925888.ba0e647fae328593d1d4c12c91b9a819fc11241e.ulm@gentoo> Subject: [gentoo-commits] dev/ulm:skey-1.1.5-patches-3 commit in: patchsets/pam_skey/1.1.5/ X-VCS-Repository: dev/ulm X-VCS-Files: patchsets/pam_skey/1.1.5/01_all_gentoo.patch patchsets/pam_skey/1.1.5/02_all_require_skey.patch X-VCS-Directories: patchsets/pam_skey/1.1.5/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: ba0e647fae328593d1d4c12c91b9a819fc11241e X-VCS-Branch: skey-1.1.5-patches-3 Date: Fri, 4 Sep 2015 08:33:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c034e4ab-454d-4bf2-8f5a-c4e1ea570813 X-Archives-Hash: 5bff16872419bf3a823caad317a55188 Message-ID: <20150904083329.C5kBqV6X4M_pTOv25Y6u1qmqwk37lVZeFhbXR2RGlPM@z> commit: ba0e647fae328593d1d4c12c91b9a819fc11241e Author: Ulrich Müller gentoo org> AuthorDate: Tue Jan 17 08:44:20 2012 +0000 Commit: Ulrich Müller gentoo 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.