summaryrefslogtreecommitdiffstats
path: root/src/man
diff options
context:
space:
mode:
authorLukas Slebodnik <lslebodn@redhat.com>2013-12-02 14:19:09 +0100
committerJakub Hrozek <jhrozek@redhat.com>2014-06-03 12:57:18 +0200
commit00fb34246a4d1d2cb846a6e2a40d8155ee5a36a1 (patch)
tree9d1a6b17d085e187154a4dce0a08b7096f73255c /src/man
parentf9b90ac1cb9ea76f369459470097996cbbc7b343 (diff)
downloadsssd-00fb34246a4d1d2cb846a6e2a40d8155ee5a36a1.tar.gz
sssd-00fb34246a4d1d2cb846a6e2a40d8155ee5a36a1.tar.xz
sssd-00fb34246a4d1d2cb846a6e2a40d8155ee5a36a1.zip
NSS: Add option to expand homedir template format
LDAP server can contain template for home directory instead of plain string. This patch adds new expand option "%H", which will be replaced with value from configuration option homedir_substring (from sssd.conf) Resolves: https://fedorahosted.org/sssd/ticket/1853 Reviewed-by: Pavel Reichl <preichl@redhat.com>
Diffstat (limited to 'src/man')
-rw-r--r--src/man/include/homedir_substring.xml18
-rw-r--r--src/man/include/override_homedir.xml7
-rw-r--r--src/man/po/po4a.cfg1
-rw-r--r--src/man/sssd-ad.5.xml1
-rw-r--r--src/man/sssd.conf.5.xml1
5 files changed, 28 insertions, 0 deletions
diff --git a/src/man/include/homedir_substring.xml b/src/man/include/homedir_substring.xml
new file mode 100644
index 000000000..54d9bc94b
--- /dev/null
+++ b/src/man/include/homedir_substring.xml
@@ -0,0 +1,18 @@
+<varlistentry>
+ <term>homedir_substring (string)</term>
+ <listitem>
+ <para>
+ The value of this option will be used in the expansion of the
+ <emphasis>override_homedir</emphasis> option if the template
+ contains the format string <emphasis>%H</emphasis>. An LDAP
+ directory entry can directly contain this template so that this
+ option can be used to expand the home directory path for each
+ client machine (or operating system). It can be set per-domain or
+ globally in the [nss] section. A value specified in a domain
+ section will override one set in the [nss] section.
+ </para>
+ <para>
+ Default: /home
+ </para>
+ </listitem>
+</varlistentry>
diff --git a/src/man/include/override_homedir.xml b/src/man/include/override_homedir.xml
index 773d0b661..552d7eb9d 100644
--- a/src/man/include/override_homedir.xml
+++ b/src/man/include/override_homedir.xml
@@ -31,6 +31,13 @@
</para></listitem>
</varlistentry>
<varlistentry>
+ <term>%H</term>
+ <listitem><para>
+ The value of configure option
+ <emphasis>homedir_substring</emphasis>.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
<term>%%</term>
<listitem><para>a literal '%'</para>
</listitem>
diff --git a/src/man/po/po4a.cfg b/src/man/po/po4a.cfg
index 7939eac75..88f997bae 100644
--- a/src/man/po/po4a.cfg
+++ b/src/man/po/po4a.cfg
@@ -37,3 +37,4 @@
[type:docbook] include/ldap_search_bases_experimental.xml $lang:$(builddir)/$lang/include/ldap_search_bases_experimental.xml opt:"-k 0"
[type:docbook] include/autofs_restart.xml $lang:$(builddir)/$lang/include/autofs_restart.xml opt:"-k 0"
[type:docbook] include/override_homedir.xml $lang:$(builddir)/$lang/include/override_homedir.xml opt:"-k 0"
+[type:docbook] include/homedir_substring.xml $lang:$(builddir)/$lang/include/homedir_substring.xml opt:"-k 0"
diff --git a/src/man/sssd-ad.5.xml b/src/man/sssd-ad.5.xml
index 0554317f5..4dd657716 100644
--- a/src/man/sssd-ad.5.xml
+++ b/src/man/sssd-ad.5.xml
@@ -349,6 +349,7 @@ FOREST:EXAMPLE.COM:(memberOf=cn=admins,ou=groups,dc=example,dc=com)
</varlistentry>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/override_homedir.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/homedir_substring.xml" />
<varlistentry>
<term>krb5_use_enterprise_principal (boolean)</term>
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index 854b55019..1a7eb4196 100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -475,6 +475,7 @@
</listitem>
</varlistentry>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/override_homedir.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/homedir_substring.xml" />
<varlistentry>
<term>fallback_homedir (string)</term>
<listitem>