diff options
| author | sbose <sbose@sles10.site> | 2009-09-09 12:10:53 +0200 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2009-09-09 09:14:25 -0400 |
| commit | eb5b5d56fbe3f1319ae8be8554d3a51c4900e5da (patch) | |
| tree | e2f2267149ceed50bbec958114219892cff1ce72 | |
| parent | 191b97b118b0c357209166c3c374dec33560ed3a (diff) | |
| download | sssd-eb5b5d56fbe3f1319ae8be8554d3a51c4900e5da.tar.gz sssd-eb5b5d56fbe3f1319ae8be8554d3a51c4900e5da.tar.xz sssd-eb5b5d56fbe3f1319ae8be8554d3a51c4900e5da.zip | |
more fixes for older libpcre versions
- older version of libpcre only support the Python syntax (?P<name>)
for named subpatterns
| -rw-r--r-- | server/man/sssd.conf.5.xml | 7 | ||||
| -rw-r--r-- | server/util/usertools.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/server/man/sssd.conf.5.xml b/server/man/sssd.conf.5.xml index f4cb87a18..b64899a0e 100644 --- a/server/man/sssd.conf.5.xml +++ b/server/man/sssd.conf.5.xml @@ -133,7 +133,7 @@ containing user name and domain into these components. </para> <para> - Default: <quote>(?<name>[^@]+)@?(?<domain>[^@]*$)</quote> + 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> @@ -144,6 +144,11 @@ 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> diff --git a/server/util/usertools.c b/server/util/usertools.c index 213483910..e4e941a68 100644 --- a/server/util/usertools.c +++ b/server/util/usertools.c @@ -64,16 +64,18 @@ int sss_names_init(TALLOC_CTX *mem_ctx, struct confdb_ctx *cdb, struct sss_names if (!ctx->re_pattern) { ctx->re_pattern = talloc_strdup(ctx, - "(?<name>[^@]+)@?(?<domain>[^@]*$)"); + "(?P<name>[^@]+)@?(?P<domain>[^@]*$)"); if (!ctx->re_pattern) { ret = ENOMEM; goto done; } #ifdef HAVE_LIBPCRE_LESSER_THAN_7 + } else { DEBUG(2, ("This binary was build with a version of libpcre that does " "not support non-unique named subpatterns.\n")); DEBUG(2, ("Please make sure that your pattern [%s] only contains " - "subpatterns with a unique name.\n", ctx->re_pattern)); + "subpatterns with a unique name and uses " + "the Python syntax (?P<name>).\n", ctx->re_pattern)); #endif } |