From 67b248ed88a064364406c9b64ebd84c90195506b Mon Sep 17 00:00:00 2001
From: Anupam Jain <anjain@localhost.localdomain>
Date: Jul 17 2013 22:47:33 +0000
Subject: Ticket #47370 - DS crashes with some 7-bit check plugin configurations


Bug description: DS crashed when some nsslapd-pluginarg were
missing. The crash was resolved with the fix to #47340 but
the correct error messages were not logged in some cases

Fix description: This patch ensures that correct error messages
are logged in the server error log

https://fedorahosted.org/389/ticket/47370

Reviewed by nhosoi.

---

diff --git a/ldap/servers/plugins/uiduniq/7bit.c b/ldap/servers/plugins/uiduniq/7bit.c
index a83122e..b6d164b 100644
--- a/ldap/servers/plugins/uiduniq/7bit.c
+++ b/ldap/servers/plugins/uiduniq/7bit.c
@@ -719,7 +719,7 @@ NS7bitAttr_Init(Slapi_PBlock *pb)
     int attr_count = 0;
     int argc;
     char **argv;
-
+    int valid_suffix = 0;
 
     /* Declare plugin version */
     err = slapi_pblock_set(pb, SLAPI_PLUGIN_VERSION,
@@ -756,11 +756,20 @@ NS7bitAttr_Init(Slapi_PBlock *pb)
     argv++; argc--;
     if(argc == 0){ err = -5; break; } /* no suffix */
     for(;argc > 0;argc--, argv++) {
+	err = slapi_dn_syntax_check(pb, *argv, 1);
+	if (err) {
+	    slapi_log_error(SLAPI_LOG_FATAL, "NS7bitAttr_Init",
+                      "Invalid suffix: %s\n", *argv);
+	    continue;
+	}
+	if (!valid_suffix)
+	    valid_suffix = 1;
         char *normdn = slapi_create_dn_string_case("%s", *argv);
         slapi_ch_free_string(argv);
         *argv = normdn;
     }
 
+    if (!valid_suffix) { err = -6; break; } /* Invalid suffix list */
     /* Provide descriptive information */
     err = slapi_pblock_set(pb, SLAPI_PLUGIN_DESCRIPTION,
             (void*)&pluginDesc);
@@ -793,7 +802,11 @@ NS7bitAttr_Init(Slapi_PBlock *pb)
       } else if(err == -5){
           slapi_log_error(SLAPI_LOG_FATAL, "NS7bitAttr_Init",
                       "Invalid plugin arguments - missing suffix\n");
+      } else if(err == -6){
+          slapi_log_error(SLAPI_LOG_FATAL, "NS7bitAttr_Init",
+                      "Invalid plugin arguments - Invalid suffix list\n");
       }
+
       err = -1;
   }
   else