further improve loglevel selection

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 890f18a2bba7ea628e9fe55937d0597466465820..1481c26a9df853b2209809d634746a7e823f2769 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -573,7 +573,18 @@ entry parsing
 .RE
 The desired log level can be input as a single integer that combines 
 the (ORed) desired levels, as a list of integers (that are ORed internally),
-or as a list of the names that are shown between brackets.
+or as a list of the names that are shown between brackets, such that
+.LP
+.nf
+    loglevel 129
+    loglevel 128 1
+    loglevel acl trace
+.fi
+.LP
+are equivalent.
+The keyword 
+.B any
+can be used as a shortcut to enable logging at all levels (equivalent to -1).
 .RE
 .TP
 .B moduleload <filename>

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 560275d3f19ede798d3c2dc791429d79ebf67003..396a90321d58720c9e4914afe4f74c2b1b6af3b0 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -2003,6 +2003,7 @@ restrict_unknown:;
                                                { LDAP_DEBUG_PARSE,     "Parse"         },
                                                { LDAP_DEBUG_CACHE,     "Cache"         },
                                                { LDAP_DEBUG_INDEX,     "Index"         },
+                                               { -1,                   "Any"           },
                                                { 0,                    NULL            }
                                        };
                                        int     j;