diff options
| author | Stef Walter <stefw@gnome.org> | 2012-04-11 15:02:10 +0200 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2012-06-12 21:28:06 -0400 |
| commit | 3c60433641ce2e86b9b04778c8f8652ef0d097e4 (patch) | |
| tree | 7e62e915dc54fc40305e5e81714190154783620c /src/man | |
| parent | 6199bd6b41e8b280e65db4b4bb17a1c5c0444aa9 (diff) | |
| download | sssd-3c60433641ce2e86b9b04778c8f8652ef0d097e4.tar.gz sssd-3c60433641ce2e86b9b04778c8f8652ef0d097e4.tar.xz sssd-3c60433641ce2e86b9b04778c8f8652ef0d097e4.zip | |
Make re_expression and full_name_format per domain options
* Allows different user/domain qualified names for different
domains. For example Domain\User or user@domain.
* The global re_expression and full_name_format options remain
as defaults for the domains.
* Subdomains get the re_expression and full_name_format of
their parent domain.
https://bugzilla.redhat.com/show_bug.cgi?id=811663
Diffstat (limited to 'src/man')
| -rw-r--r-- | src/man/sssd.conf.5.xml | 67 |
1 files changed, 49 insertions, 18 deletions
diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml index c946c6e1f..4e38ffe6d 100644 --- a/src/man/sssd.conf.5.xml +++ b/src/man/sssd.conf.5.xml @@ -122,25 +122,12 @@ <term>re_expression (string)</term> <listitem> <para> - Regular expression that describes how to parse the string + Default regular expression that describes how to parse the string containing user name and domain into these components. </para> <para> - Default: <quote>(?P<name>[^@]+)@?(?P<domain>[^@]*$)</quote> - 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 - subpatterns is not available on all platforms - (e.g. RHEL5 and SLES10). Only platforms with - libpcre version 7 or higher can support non-unique - named subpatterns. - </para> - <para> - PLEASE NOTE ALSO: older version of libpcre only - support the Python syntax (?P<name>) to label - subpatterns. + Each domain can have an individual regular expression configured. + see DOMAIN SECTIONS for more info on these regular expressions. </para> </listitem> </varlistentry> @@ -148,7 +135,7 @@ <term>full_name_format (string)</term> <listitem> <para> - A <citerefentry> + The default <citerefentry> <refentrytitle>printf</refentrytitle> <manvolnum>3</manvolnum> </citerefentry>-compatible format that describes how to @@ -156,7 +143,8 @@ name. </para> <para> - Default: <quote>%1$s@%2$s</quote>. + Each domain can have an individual format string configured. + see DOMAIN SECTIONS for more info on this option. </para> </listitem> </varlistentry> @@ -1287,6 +1275,49 @@ </varlistentry> <varlistentry> + <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. + </para> + <para> + Default: <quote>(?P<name>[^@]+)@?(?P<domain>[^@]*$)</quote> + 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 + subpatterns is not available on all platforms + (e.g. RHEL5 and SLES10). Only platforms with + libpcre version 7 or higher can support non-unique + named subpatterns. + </para> + <para> + PLEASE NOTE ALSO: older version of libpcre only + support the Python syntax (?P<name>) to label + subpatterns. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term>full_name_format (string)</term> + <listitem> + <para> + A <citerefentry> + <refentrytitle>printf</refentrytitle> + <manvolnum>3</manvolnum> + </citerefentry>-compatible format that describes how to + translate a (name, domain) tuple for this domain into a fully + qualified name. + </para> + <para> + Default: <quote>%1$s@%2$s</quote>. + </para> + </listitem> + </varlistentry> + + <varlistentry> <term>lookup_family_order (string)</term> <listitem> <para> |