4c80037896
(cherry picked from commitfa4807ec45) (cherry picked from commit323dbdee02) (cherry picked from commit7e532024f0)
123 lines
6.7 KiB
Diff
123 lines
6.7 KiB
Diff
From 77e5c3fc26085f18277a70ffbd6351a8130963e7 Mon Sep 17 00:00:00 2001
|
|
From: Yuri Chornoivan <yurchor@ukr.net>
|
|
Date: Wed, 26 Jul 2017 16:45:35 +0300
|
|
Subject: [PATCH 01/93] Fix minor typos
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Merges: https://pagure.io/SSSD/sssd/pull-request/3456
|
|
|
|
Reviewed-by: Michal Židek <mzidek@redhat.com>
|
|
---
|
|
src/config/SSSDConfig/__init__.py.in | 6 +++---
|
|
src/db/sysdb.h | 2 +-
|
|
src/man/sss-certmap.5.xml | 2 +-
|
|
src/man/sssd-ad.5.xml | 4 ++--
|
|
src/man/sssd.conf.5.xml | 2 +-
|
|
src/providers/ad/ad_machine_pw_renewal.c | 2 +-
|
|
6 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in
|
|
index cd844ce2b45beefc3fc48f6ab09dc427c646ac8d..303bc62f42691e3f21aae393a301742f090e6f82 100644
|
|
--- a/src/config/SSSDConfig/__init__.py.in
|
|
+++ b/src/config/SSSDConfig/__init__.py.in
|
|
@@ -92,7 +92,7 @@ option_strings = {
|
|
'offline_failed_login_attempts' : _('How many failed logins attempts are allowed when offline'),
|
|
'offline_failed_login_delay' : _('How long (minutes) to deny login after offline_failed_login_attempts has been reached'),
|
|
'pam_verbosity' : _('What kind of messages are displayed to the user during authentication'),
|
|
- 'pam_response_filter' : _('Filter PAM responses send the pam_sss'),
|
|
+ 'pam_response_filter' : _('Filter PAM responses sent by the pam_sss'),
|
|
'pam_id_timeout' : _('How many seconds to keep identity information cached for PAM requests'),
|
|
'pam_pwd_expiration_warning' : _('How many days before password expiration a warning should be displayed'),
|
|
'pam_trusted_users' : _('List of trusted uids or user\'s name'),
|
|
@@ -100,7 +100,7 @@ option_strings = {
|
|
'pam_account_expired_message' : _('Message printed when user account is expired.'),
|
|
'pam_account_locked_message' : _('Message printed when user account is locked.'),
|
|
'pam_cert_auth' : _('Allow certificate based/Smartcard authentication.'),
|
|
- 'pam_cert_db_path' : _('Path to certificate databse with PKCS#11 modules.'),
|
|
+ 'pam_cert_db_path' : _('Path to certificate database with PKCS#11 modules.'),
|
|
'p11_child_timeout' : _('How many seconds will pam_sss wait for p11_child to finish'),
|
|
'pam_app_services' : _('Which PAM services are permitted to contact application domains'),
|
|
|
|
@@ -238,7 +238,7 @@ option_strings = {
|
|
'ad_gpo_default_right' : _('Default logon right (or permit/deny) to use for unmapped PAM service names'),
|
|
'ad_site' : _('a particular site to be used by the client'),
|
|
'ad_maximum_machine_account_password_age' : _('Maximum age in days before the machine account password should be renewed'),
|
|
- 'ad_machine_account_password_renewal_opts' : _('Option for tuing the machine account renewal task'),
|
|
+ 'ad_machine_account_password_renewal_opts' : _('Option for tuning the machine account renewal task'),
|
|
|
|
# [provider/krb5]
|
|
'krb5_kdcip' : _('Kerberos server address'),
|
|
diff --git a/src/db/sysdb.h b/src/db/sysdb.h
|
|
index 21d6cf4fc90a050e203e1609be5ee267a618dda9..b045684db0c8e6e68842b72b3830481b73cf2cbe 100644
|
|
--- a/src/db/sysdb.h
|
|
+++ b/src/db/sysdb.h
|
|
@@ -819,7 +819,7 @@ int sysdb_get_netgroup_attr(TALLOC_CTX *mem_ctx,
|
|
const char **attributes,
|
|
struct ldb_result **res);
|
|
|
|
-/* functions that modify the databse
|
|
+/* functions that modify the database
|
|
* they have to be called within a transaction
|
|
* See sysdb_transaction_send()/_recv() */
|
|
|
|
diff --git a/src/man/sss-certmap.5.xml b/src/man/sss-certmap.5.xml
|
|
index bbe68509f2222613a7ed69599519d7fca0506df0..12df6a7936dfe4346a05d7baffe6f44fed8e1879 100644
|
|
--- a/src/man/sss-certmap.5.xml
|
|
+++ b/src/man/sss-certmap.5.xml
|
|
@@ -359,7 +359,7 @@
|
|
This should be preferred to read user specific data from the
|
|
certificate like e.g. an email address and search for it in the LDAP
|
|
server. The reason is that the user specific data in LDAP might
|
|
- change for various reasons would would break the mapping. On the
|
|
+ change for various reasons would break the mapping. On the
|
|
other hand it would be hard to break the mapping on purpose for a
|
|
specific user.
|
|
</para>
|
|
diff --git a/src/man/sssd-ad.5.xml b/src/man/sssd-ad.5.xml
|
|
index cd25bf7fa34b7c779d17f781db599740198c663c..59c23e68123d7b83c19ed6ba256989ab4e643b6d 100644
|
|
--- a/src/man/sssd-ad.5.xml
|
|
+++ b/src/man/sssd-ad.5.xml
|
|
@@ -827,9 +827,9 @@ ad_gpo_map_deny = +my_pam_service
|
|
<para>
|
|
This option should only be used to test the machine
|
|
account renewal task. The option expect 2 integers
|
|
- seperated by a colon (':'). The first integer
|
|
+ separated by a colon (':'). The first integer
|
|
defines the interval in seconds how often the task
|
|
- is run. The second specifies the inital timeout in
|
|
+ is run. The second specifies the initial timeout in
|
|
seconds before the task is run for the first time
|
|
after startup.
|
|
</para>
|
|
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
|
|
index 22daf30990845af33e1cbd5316cbd790924d86f0..7c4cd1f2e5c453964def9c04967f9adc232bb776 100644
|
|
--- a/src/man/sssd.conf.5.xml
|
|
+++ b/src/man/sssd.conf.5.xml
|
|
@@ -1098,7 +1098,7 @@ fallback_homedir = /home/%u
|
|
<listitem>
|
|
<para>
|
|
A comma separated list of strings which allows to
|
|
- remove (filter) data send by the PAM responder to
|
|
+ remove (filter) data sent by the PAM responder to
|
|
pam_sss PAM module. There are different kind of
|
|
responses send to pam_sss e.g. messages displayed to
|
|
the user or environment variables which should be
|
|
diff --git a/src/providers/ad/ad_machine_pw_renewal.c b/src/providers/ad/ad_machine_pw_renewal.c
|
|
index fd7666e3578007c42375cf1f8b4b8c267f248ebd..5b6ba26b72ba441e200c4a81e1faef127e216b6b 100644
|
|
--- a/src/providers/ad/ad_machine_pw_renewal.c
|
|
+++ b/src/providers/ad/ad_machine_pw_renewal.c
|
|
@@ -88,7 +88,7 @@ static errno_t get_adcli_extra_args(const char *ad_domain,
|
|
talloc_free(args);
|
|
return ENOMEM;
|
|
}
|
|
- } while (c != 1); /* is is expected that the first element is NULL */
|
|
+ } while (c != 1); /* it is expected that the first element is NULL */
|
|
|
|
renewal_data->extra_args = args;
|
|
|
|
--
|
|
2.14.1
|
|
|