summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2013-04-08 22:53:57 +0200
committerJakub Hrozek <jhrozek@redhat.com>2013-04-10 13:38:44 +0200
commit591b0325f5d6f70ae71e61a8c563b437acfb1884 (patch)
tree9c826271f089eef953c6af9c5d7ca1f0349f801b
parent0d85acdc04789bd3189d0d890675d3e66bce2db8 (diff)
downloadsssd-591b0325f5d6f70ae71e61a8c563b437acfb1884.tar.gz
sssd-591b0325f5d6f70ae71e61a8c563b437acfb1884.tar.bz2
sssd-591b0325f5d6f70ae71e61a8c563b437acfb1884.zip
Put the override_homedir into an included xml file
The description was duplicated on two places, leading to errors where one was amended but the other was not.
-rw-r--r--src/man/include/override_homedir.xml54
-rw-r--r--src/man/sssd-ad.5.xml88
-rw-r--r--src/man/sssd.conf.5.xml55
3 files changed, 56 insertions, 141 deletions
diff --git a/src/man/include/override_homedir.xml b/src/man/include/override_homedir.xml
new file mode 100644
index 00000000..773d0b66
--- /dev/null
+++ b/src/man/include/override_homedir.xml
@@ -0,0 +1,54 @@
+<varlistentry>
+<term>override_homedir (string)</term>
+<listitem>
+ <para>
+ Override the user's home directory. You
+ can either provide an absolute value or a
+ template. In the template, the following
+ sequences are substituted:
+ <variablelist>
+ <varlistentry>
+ <term>%u</term>
+ <listitem><para>login name</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>%U</term>
+ <listitem><para>UID number</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>%d</term>
+ <listitem><para>domain name</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>%f</term>
+ <listitem><para>fully qualified user name (user@domain)</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>%o</term>
+ <listitem><para>
+ The original home directory retrieved
+ from the identity provider.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>%%</term>
+ <listitem><para>a literal '%'</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ <para>
+ This option can also be set per-domain.
+ </para>
+ <para>
+ example:
+ <programlisting>
+override_homedir = /home/%u
+ </programlisting>
+ </para>
+ <para>
+ Default: Not set (SSSD will use the value
+ retrieved from LDAP)
+ </para>
+</listitem>
+</varlistentry>
diff --git a/src/man/sssd-ad.5.xml b/src/man/sssd-ad.5.xml
index a628e0d6..6ab133d5 100644
--- a/src/man/sssd-ad.5.xml
+++ b/src/man/sssd-ad.5.xml
@@ -128,93 +128,7 @@ ldap_id_mapping = False
</listitem>
</varlistentry>
- <varlistentry>
- <term>override_homedir (string)</term>
- <listitem>
- <para>
- Override the user's home directory. You
- can either provide an absolute value or a
- template. In the template, the following
- sequences are substituted:
- <variablelist>
- <varlistentry>
- <term>%u</term>
- <listitem><para>login name</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>%U</term>
- <listitem><para>UID number</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>%d</term>
- <listitem><para>domain name</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>%f</term>
- <listitem><para>fully qualified user name (user@domain)</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>%%</term>
- <listitem><para>a literal '%'</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
- <para>
- This option can also be set per-domain.
- </para>
- <para>
- example:
- <programlisting>
-override_homedir = /home/%u
- </programlisting>
- </para>
- <para>
- Default: Not set (SSSD will use the value
- retrieved from LDAP)
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>fallback_homedir (string)</term>
- <listitem>
- <para>
- Set a default template for a user's home directory
- if one is not specified explicitly by the domain's
- data provider.
- </para>
- <para>
- The available values for this option are the same
- as for override_homedir.
- </para>
- <para>
- example:
- <programlisting>
-fallback_homedir = /home/%u
- </programlisting>
- </para>
- <para>
- Default: not set (no substitution for unset home
- directories)
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>default_shell</term>
- <listitem>
- <para>
- The default shell to use if the provider does not
- return one during lookup. This option supersedes
- any other shell options if it takes effect and can
- be set either in the [nss] section or per-domain.
- </para>
- <para>
- Default: not set (Return NULL if no shell is
- specified and rely on libc to substitute something
- sensible when necessary, usually /bin/sh)
- </para>
- </listitem>
- </varlistentry>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/override_homedir.xml" />
</variablelist>
</para>
</refsect1>
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index 373a504d..7bcccee8 100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -442,60 +442,7 @@
</para>
</listitem>
</varlistentry>
- <varlistentry>
- <term>override_homedir (string)</term>
- <listitem>
- <para>
- Override the user's home directory. You
- can either provide an absolute value or a
- template. In the template, the following
- sequences are substituted:
- <variablelist>
- <varlistentry>
- <term>%u</term>
- <listitem><para>login name</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>%U</term>
- <listitem><para>UID number</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>%d</term>
- <listitem><para>domain name</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>%f</term>
- <listitem><para>fully qualified user name (user@domain)</para></listitem>
- </varlistentry>
- <varlistentry>
- <term>%o</term>
- <listitem><para>
- The original home directory retrieved
- from the identity provider.
- </para></listitem>
- </varlistentry>
- <varlistentry>
- <term>%%</term>
- <listitem><para>a literal '%'</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </para>
- <para>
- This option can also be set per-domain.
- </para>
- <para>
- example:
- <programlisting>
-override_homedir = /home/%u
- </programlisting>
- </para>
- <para>
- Default: Not set (SSSD will use the value
- retrieved from LDAP)
- </para>
- </listitem>
- </varlistentry>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/override_homedir.xml" />
<varlistentry>
<term>fallback_homedir (string)</term>
<listitem>