From eedf2fc4c1432f805b16ae52939cf5e67e8df550 Mon Sep 17 00:00:00 2001
From: Michal Zidek <mzidek@redhat.com>
Date: Mon, 24 Nov 2014 19:50:14 +0100
Subject: [PATCH 111/112] util: Special-case PCRE_ERROR_NOMATCH in
 sss_parse_name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add new SSSD specific error code for the case when
pcre_exec returns PCRE_ERROR_NOMATCH.

Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
---
 src/tests/cmocka/test_fqnames.c | 14 +++++++-------
 src/util/usertools.c            |  2 +-
 src/util/util_errors.c          |  1 +
 src/util/util_errors.h          |  1 +
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/tests/cmocka/test_fqnames.c b/src/tests/cmocka/test_fqnames.c
index de208437d3d11429ebb4fd92ac6b1469564d9174..b9b6230b9e2c86dafae159630d5202e46992f5f3 100644
--- a/src/tests/cmocka/test_fqnames.c
+++ b/src/tests/cmocka/test_fqnames.c
@@ -471,13 +471,13 @@ void sss_parse_name_fail(void **state)
     struct parse_name_test_ctx *test_ctx = talloc_get_type(*state,
                                                            struct parse_name_test_ctx);
 
-    sss_parse_name_check(test_ctx, "", EINVAL, NULL, NULL);
-    sss_parse_name_check(test_ctx, "@", EINVAL, NULL, NULL);
-    sss_parse_name_check(test_ctx, "\\", EINVAL, NULL, NULL);
-    sss_parse_name_check(test_ctx, "\\"NAME, EINVAL, NULL, NULL);
-    sss_parse_name_check(test_ctx, "@"NAME, EINVAL, NULL, NULL);
-    sss_parse_name_check(test_ctx, NAME"@", EINVAL, NULL, NULL);
-    sss_parse_name_check(test_ctx, NAME"\\", EINVAL, NULL, NULL);
+    sss_parse_name_check(test_ctx, "", ERR_REGEX_NOMATCH, NULL, NULL);
+    sss_parse_name_check(test_ctx, "@", ERR_REGEX_NOMATCH, NULL, NULL);
+    sss_parse_name_check(test_ctx, "\\", ERR_REGEX_NOMATCH, NULL, NULL);
+    sss_parse_name_check(test_ctx, "\\"NAME, ERR_REGEX_NOMATCH, NULL, NULL);
+    sss_parse_name_check(test_ctx, "@"NAME, ERR_REGEX_NOMATCH, NULL, NULL);
+    sss_parse_name_check(test_ctx, NAME"@", ERR_REGEX_NOMATCH, NULL, NULL);
+    sss_parse_name_check(test_ctx, NAME"\\", ERR_REGEX_NOMATCH, NULL, NULL);
 }
 
 void test_sss_get_domain_name(void **state)
diff --git a/src/util/usertools.c b/src/util/usertools.c
index a0b914e2fe8f65a71015944e63cb2d2813345d84..09cfd6b35505b8496413258fd05808ac0d2c095b 100644
--- a/src/util/usertools.c
+++ b/src/util/usertools.c
@@ -309,7 +309,7 @@ int sss_parse_name(TALLOC_CTX *memctx,
 
     ret = pcre_exec(re, NULL, orig, origlen, 0, PCRE_NOTEMPTY, ovec, 30);
     if (ret == PCRE_ERROR_NOMATCH) {
-        return EINVAL;
+        return ERR_REGEX_NOMATCH;
     } else if (ret < 0) {
         DEBUG(SSSDBG_MINOR_FAILURE, "PCRE Matching error, %d\n", ret);
         return EINVAL;
diff --git a/src/util/util_errors.c b/src/util/util_errors.c
index c1ed0fb634c447904b63335d1cd161b7e7914a08..16d16fc777fc3344db8a3bdfeb3633bd5db48530 100644
--- a/src/util/util_errors.c
+++ b/src/util/util_errors.c
@@ -64,6 +64,7 @@ struct err_string error_to_str[] = {
     { "Cannot connect to system bus" }, /* ERR_NO_SYSBUS */
     { "LDAP search returned a referral" }, /* ERR_REFERRAL */
     { "Error setting SELinux user context" }, /* ERR_SELINUX_CONTEXT */
+    { "Username format not allowed by re_expression" }, /* ERR_REGEX_NOMATCH */
 };
 
 
diff --git a/src/util/util_errors.h b/src/util/util_errors.h
index f71ede8d0fa000627a1bd994ec8bd94a632b35b2..39455dc8adfe8784bd3f06382d701b7f9e97f004 100644
--- a/src/util/util_errors.h
+++ b/src/util/util_errors.h
@@ -86,6 +86,7 @@ enum sssd_errors {
     ERR_NO_SYSBUS,
     ERR_REFERRAL,
     ERR_SELINUX_CONTEXT,
+    ERR_REGEX_NOMATCH,
     ERR_LAST            /* ALWAYS LAST */
 };
 
-- 
1.9.3