From 767caa58f91bf87586c872b67896297ff4073241 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Mon, 1 Oct 2012 12:56:04 +0200
Subject: Add man page section about provider specific re_expression

Fixes: https://fedorahosted.org/sssd/ticket/1525
---
 src/man/sssd.conf.5.xml | 41 +++++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

(limited to 'src/man/sssd.conf.5.xml')

diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml
index 6fbbd9adf..92fcc9b99 100644
--- a/src/man/sssd.conf.5.xml
+++ b/src/man/sssd.conf.5.xml
@@ -124,12 +124,16 @@
                         <term>re_expression (string)</term>
                         <listitem>
                             <para>
-                                Default regular expression that describes how to parse the string
-                                containing user name and domain into these components.
+                                Default regular expression that describes how to
+                                parse the string containing user name and domain
+                                into these components.
                             </para>
                             <para>
-                                Each domain can have an individual regular expression configured.
-                                see DOMAIN SECTIONS for more info on these regular expressions.
+                                Each domain can have an individual regular
+                                expression configured. For some ID providers
+                                there are also default regular expressions.  See
+                                DOMAIN SECTIONS for more info on these regular
+                                expressions.
                             </para>
                         </listitem>
                     </varlistentry>
@@ -1459,13 +1463,34 @@ override_homedir = /home/%u
                     <term>re_expression (string)</term>
                     <listitem>
                         <para>
-                            Regular expression for this domain that describes how to parse
-                            the string containing user name and domain into these components.
+                            Regular expression for this domain that describes
+                            how to parse the string containing user name and
+                            domain into these components.
+                        </para>
+                        <para>
+                            Default for the AD and IPA provider:
+                            <quote>(((?P&lt;domain&gt;[^\\]+)\\(?P&lt;name&gt;.+$))|((?P&lt;name&gt;[^@]+)@(?P&lt;domain&gt;.+$))|(^(?P&lt;name&gt;[^@\\]+)$))</quote>
+                            which allows three different styles for user names:
+                            <itemizedlist>
+                                <listitem>
+                                    <para>username</para>
+                                </listitem>
+                                <listitem>
+                                    <para>username@domain.name</para>
+                                </listitem>
+                                <listitem>
+                                    <para>domain\username</para>
+                                </listitem>
+                            </itemizedlist>
+                            While the first two correspond to the general
+                            default the third one is introduced to allow easy
+                            integration of users from Windows domains.
                         </para>
                         <para>
                             Default: <quote>(?P&lt;name&gt;[^@]+)@?(?P&lt;domain&gt;[^@]*$)</quote>
-                            which translates to "the name is everything up to the
-                            <quote>@</quote> sign, the domain everything after that"
+                            which translates to "the name is everything up to
+                            the <quote>@</quote> sign, the domain everything
+                            after that"
                         </para>
                         <para>
                             PLEASE NOTE: the support for non-unique named
-- 
cgit