Import ITS#2007 and ITS#2009 bug fixes from HEAD

[openldap] / servers / slapd / limits.c

diff --git a/servers/slapd/limits.c b/servers/slapd/limits.c
index c33726e71190b011a143de2f8a8eb210618142a3..c34e84882164cf464ffff65fed2ba270e8f16627 100644 (file)
--- a/servers/slapd/limits.c
+++ b/servers/slapd/limits.c
@@ -223,10 +223,9 @@ parse_limits(
 
        if ( argc < 3 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
+               LDAP_LOG( CONFIG, CRIT, 
                        "%s : line %d: missing arg(s) in "
-                       "\"limits <pattern> <limits>\" line.\n",
-                       fname, lineno ));
+                       "\"limits <pattern> <limits>\" line.\n", fname, lineno, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "%s : line %d: missing arg(s) in "
@@ -328,13 +327,11 @@ parse_limits(
                default:
                        if ( pattern[0] != '=' ) {
 #ifdef NEW_LOGGING
-                               LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
+                               LDAP_LOG( CONFIG, CRIT, 
                                        "%s : line %d: missing '=' in "
                                        "\"dn[.{exact|base|one|subtree"
-                                       "|children|regex|anonymous}]"
-                                       "=<pattern>\" in "
-                                       "\"limits <pattern> <limits>\" line.\n",
-                                       fname, lineno ));
+                                       "|children|regex|anonymous}]" "=<pattern>\" in "
+                                       "\"limits <pattern> <limits>\" line.\n", fname, lineno, 0 );
 #else
                                Debug( LDAP_DEBUG_ANY,
                                        "%s : line %d: missing '=' in "
@@ -369,10 +366,10 @@ parse_limits(
                if ( parse_limit( argv[i], &limit ) ) {
 
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
+                       LDAP_LOG( CONFIG, CRIT, 
                                "%s : line %d: unknown limit type \"%s\" in "
                                "\"limits <pattern> <limits>\" line.\n",
-                       fname, lineno, argv[i] ));
+                               fname, lineno, argv[i] );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "%s : line %d: unknown limit type \"%s\" in "