From 41e6554c66b2f373f554cee46a0609e4f209e549 Mon Sep 17 00:00:00 2001 From: Karol Babioch Date: Wed, 2 May 2018 14:40:18 +0200 Subject: [PATCH] Spell system-wide consistently throughout the project --- doc/Authentication_Using_Challenge-Response.adoc | 6 +++--- doc/Two_Factor_PAM_Configuration.adoc | 2 +- util.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/Authentication_Using_Challenge-Response.adoc b/doc/Authentication_Using_Challenge-Response.adoc index fbe88d4..2492076 100644 --- a/doc/Authentication_Using_Challenge-Response.adoc +++ b/doc/Authentication_Using_Challenge-Response.adoc @@ -11,9 +11,9 @@ in the current user's home directory (`$HOME/.yubico/challenge-123456` for a YubiKey with serial number API readout enabled, and `$HOME/.yubico/challenge` for one without). -The PAM module supports a system wide directory for these state files -(in case the user's home directories are encrypted), but in a system -wide directory, the 'challenge' part should be replaced with the +The PAM module supports a system-wide directory for these state files +(in case the user's home directories are encrypted), but in a system-wide +directory, the 'challenge' part should be replaced with the username. Example: `/var/yubico/alice-123456`. To use the system-wide mode, you currently have to move the generated diff --git a/doc/Two_Factor_PAM_Configuration.adoc b/doc/Two_Factor_PAM_Configuration.adoc index 7663033..018b00e 100644 --- a/doc/Two_Factor_PAM_Configuration.adoc +++ b/doc/Two_Factor_PAM_Configuration.adoc @@ -8,7 +8,7 @@ auth required pam_unix.so use_first_pass ---- The first line makes pam_yubico check the OTP. Use either a per-user -file called `~/.yubico/authorized_yubikeys`, or a system wide file called +file called `~/.yubico/authorized_yubikeys`, or a system-wide file called `/etc/yubikey_mappings` to specify which Yubikeys that can be used to log in as specific users. See https://developers.yubico.com/yubico-pam[the README] for more information. diff --git a/util.c b/util.c index 8c8efa1..a9a6fe6 100644 --- a/util.c +++ b/util.c @@ -56,7 +56,7 @@ int get_user_cfgfile_path(const char *common_path, const char *filename, const struct passwd *user, char **fn) { /* Getting file from user home directory, e.g. ~/.yubico/challenge, or - * from a system wide directory. + * from a system-wide directory. * * Format is hex(challenge):hex(response):slot num */ @@ -359,7 +359,7 @@ int get_user_challenge_file(YK_KEY *yk, const char *chalresp_path, const struct passwd *user, char **fn, FILE *debug_file) { /* Getting file from user home directory, i.e. ~/.yubico/challenge, or - * from a system wide directory. + * from a system-wide directory. */ /* The challenge to use is located in a file in the user's home directory,