7bddea6c90
Resolves: rhbz#1437199 - sssd-nfs-idmap-1.15.2-1.fc25.x86_64 conflicts with
file from package sssd-common-1.15.1-1.fc25.x86_64
Resolves: rhbz#1063278 - sss_ssh_knownhostsproxy doesn't fall back to ipv4
170 lines
9.1 KiB
Diff
170 lines
9.1 KiB
Diff
From 0a86dede8773ecce91b5bd2ae75a02f9ff89a358 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ren=C3=A9=20Genz?= <liebundartig@freenet.de>
|
|
Date: Wed, 19 Apr 2017 08:36:12 +0000
|
|
Subject: [PATCH 111/135] minor typo fixes
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Merges: https://pagure.io/SSSD/sssd/pull-request/3374
|
|
|
|
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
|
|
Reviewed-by: Justin Stephenson <jstephen@redhat.com>
|
|
---
|
|
src/man/idmap_sss.8.xml | 2 +-
|
|
src/man/sssd-kcm.8.xml | 2 +-
|
|
src/man/sssd-ldap.5.xml | 8 ++++----
|
|
src/man/sssd.conf.5.xml | 18 +++++++++---------
|
|
src/tests/intg/test_files_provider.py | 2 +-
|
|
5 files changed, 16 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/src/man/idmap_sss.8.xml b/src/man/idmap_sss.8.xml
|
|
index 4c26a17f958fbf7251ad64de916db9de02c48364..0b73966e5952705a0f340ac169775c30153c392d 100644
|
|
--- a/src/man/idmap_sss.8.xml
|
|
+++ b/src/man/idmap_sss.8.xml
|
|
@@ -32,7 +32,7 @@
|
|
<varlistentry>
|
|
<term>range = low - high</term>
|
|
<listitem><para>
|
|
- Defines the available matching uid and gid range for which the
|
|
+ Defines the available matching UID and GID range for which the
|
|
backend is authoritative.
|
|
</para></listitem>
|
|
</varlistentry>
|
|
diff --git a/src/man/sssd-kcm.8.xml b/src/man/sssd-kcm.8.xml
|
|
index 5dc93838e48723bdb470c0a9c8575bd17c7593e8..db50ed8b49294057da99b01655a4b158f2908dcb 100644
|
|
--- a/src/man/sssd-kcm.8.xml
|
|
+++ b/src/man/sssd-kcm.8.xml
|
|
@@ -48,7 +48,7 @@
|
|
<itemizedlist>
|
|
<listitem>
|
|
<para>
|
|
- since the process runs in userspace, it is subject to UID namespacing, ulike the kernel keyring
|
|
+ since the process runs in userspace, it is subject to UID namespacing, unlike the kernel keyring
|
|
</para>
|
|
</listitem>
|
|
<listitem>
|
|
diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml
|
|
index fae669a8d0c1119b68e087bb16def7bd9a4464d3..739ae15c359da4e8dad9bc225ea60cff9dc96b91 100644
|
|
--- a/src/man/sssd-ldap.5.xml
|
|
+++ b/src/man/sssd-ldap.5.xml
|
|
@@ -965,7 +965,7 @@
|
|
domains.
|
|
</para>
|
|
<para>
|
|
- Default: groupType in the AD provider, othewise not
|
|
+ Default: groupType in the AD provider, otherwise not
|
|
set
|
|
</para>
|
|
</listitem>
|
|
@@ -1591,7 +1591,7 @@
|
|
</varlistentry>
|
|
|
|
<varlistentry>
|
|
- <term>ldap_min_id, ldap_max_id (interger)</term>
|
|
+ <term>ldap_min_id, ldap_max_id (integer)</term>
|
|
<listitem>
|
|
<para>
|
|
In contrast to the SID based ID mapping which is
|
|
@@ -1939,7 +1939,7 @@ ldap_access_filter = (employeeType=admin)
|
|
was granted access permission. If they were
|
|
granted access during their last login, they will
|
|
continue to be granted access while offline and
|
|
- vice-versa.
|
|
+ vice versa.
|
|
</para>
|
|
<para>
|
|
Default: Empty
|
|
@@ -2633,7 +2633,7 @@ ldap_access_filter = (employeeType=admin)
|
|
If the option <quote>ldap_use_tokengroups</quote> is
|
|
enabled. The searches against Active Directory will
|
|
not be restricted and return all groups memberships,
|
|
- even with no gid mapping. It is recommended to disable
|
|
+ even with no GID mapping. It is recommended to disable
|
|
this feature, if group names are not being displayed
|
|
correctly.
|
|
</para>
|
|
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
|
|
index c4e30396f16c40db37af2f56ac218b6e37201ef7..c71287029f132906e4f17ff6618d5234a27617f1 100644
|
|
--- a/src/man/sssd.conf.5.xml
|
|
+++ b/src/man/sssd.conf.5.xml
|
|
@@ -246,7 +246,7 @@
|
|
information. SSSD can use more domains
|
|
at the same time, but at least one
|
|
must be configured or SSSD won't start.
|
|
- This parameter described the list of domains
|
|
+ This parameter describes the list of domains
|
|
in the order you want them to be queried.
|
|
A domain name should only consist of alphanumeric
|
|
ASCII characters, dashes, dots and underscores.
|
|
@@ -264,7 +264,7 @@
|
|
<para>
|
|
Each domain can have an individual regular
|
|
expression configured. For some ID providers
|
|
- there are also default regular expressions. See
|
|
+ there are also default regular expressions. See
|
|
DOMAIN SECTIONS for more info on these regular
|
|
expressions.
|
|
</para>
|
|
@@ -490,7 +490,7 @@
|
|
<para>The nickname of the cert to trust
|
|
(expected) to sign the OCSP responses.
|
|
The certificate with the given nickname
|
|
- must be availble in the systems NSS
|
|
+ must be available in the systems NSS
|
|
database.</para>
|
|
<para>This option must be used together
|
|
with ocsp_default_responder.</para>
|
|
@@ -1253,7 +1253,7 @@ fallback_homedir = /home/%u
|
|
</para>
|
|
<para>
|
|
Note: Please be aware that message is only
|
|
- printed for the SSH service unless pam_verbostiy
|
|
+ printed for the SSH service unless pam_verbosity
|
|
is set to 3 (show all messages and debug
|
|
information).
|
|
</para>
|
|
@@ -1456,13 +1456,13 @@ pam_account_locked_message = Account locked, please contact help desk.
|
|
authentication to the PAC responder. The sub-domain provider
|
|
collects domain SID and ID ranges of the domain the client is
|
|
joined to and of remote trusted domains from the local domain
|
|
- controller. If the PAC is decoded and evaluated some of the
|
|
+ controller. If the PAC is decoded and evaluated some of the
|
|
following operations are done:
|
|
<itemizedlist>
|
|
<listitem><para>If the remote user does not exist in the
|
|
- cache, it is created. The uid is determined with the help
|
|
- of the SID, trusted domains will have UPGs and the gid
|
|
- will have the same value as the uid. The home directory is
|
|
+ cache, it is created. The UID is determined with the help
|
|
+ of the SID, trusted domains will have UPGs and the GID
|
|
+ will have the same value as the UID. The home directory is
|
|
set based on the subdomain_homedir parameter. The shell will
|
|
be empty by default, i.e. the system defaults are used, but
|
|
can be overwritten with the default_shell parameter.</para>
|
|
@@ -2110,7 +2110,7 @@ pam_account_locked_message = Account locked, please contact help desk.
|
|
</para>
|
|
<para>
|
|
<quote>ldap</quote> to change a password stored
|
|
- in a LDAP server. See
|
|
+ in a LDAP server. See
|
|
<citerefentry>
|
|
<refentrytitle>sssd-ldap</refentrytitle>
|
|
<manvolnum>5</manvolnum>
|
|
diff --git a/src/tests/intg/test_files_provider.py b/src/tests/intg/test_files_provider.py
|
|
index 8748ac10b089087056b1b93950c8d890a190c8d0..eced3997cd061b155f68ec5b2d15552061ffe3e3 100644
|
|
--- a/src/tests/intg/test_files_provider.py
|
|
+++ b/src/tests/intg/test_files_provider.py
|
|
@@ -433,7 +433,7 @@ def test_incomplete_user_fail(setup_pw_with_canary, files_domain_only):
|
|
Test resolving an incomplete user where the missing field is required
|
|
to be present in the user record and thus the user shouldn't resolve.
|
|
|
|
- We cannot test uid and gid missing because nss_wrapper doesn't even
|
|
+ We cannot test UID and GID missing because nss_wrapper doesn't even
|
|
load the malformed passwd file, then.
|
|
"""
|
|
bad_incomplete_user_setup(setup_pw_with_canary, 'name')
|
|
--
|
|
2.12.2
|
|
|