Fix external_acl_type default children documentations

The max children has always been 5, not 20.

Also, make mgr:config report dumper actually hide only the real default
values. (sync with helper/ChildConfig.cc defaults)

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 4ba0803ef443d073750fc8f2f94bf687fae5c453..8e596ce89d625eb629e50abdd6daa9a28caf2ea0 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -678,7 +678,7 @@ DOC_START
 
          children-max=n
                        Maximum number of acl helper processes spawned to service
-                       external acl lookups of this type. (default 20)
+                       external acl lookups of this type. (default 5)
 
          children-startup=n
                        Minimum number of acl helper processes to spawn during

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 70b4e4470fb193c79ea77ab17daa34d97482c2af..3bbb5cf5794ce5eecf3d8f55d4943ee1f8045d40 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -474,13 +474,13 @@ dump_externalAclHelper(StoreEntry * sentry, const char *name, const external_acl
         if (node->children.n_max != DEFAULT_EXTERNAL_ACL_CHILDREN)
             storeAppendPrintf(sentry, " children-max=%d", node->children.n_max);
 
-        if (node->children.n_startup != 1)
+        if (node->children.n_startup != 0) // sync with helper/ChildConfig.cc default
             storeAppendPrintf(sentry, " children-startup=%d", node->children.n_startup);
 
-        if (node->children.n_idle != (node->children.n_max + node->children.n_startup) )
+        if (node->children.n_idle != 1) // sync with helper/ChildConfig.cc default
             storeAppendPrintf(sentry, " children-idle=%d", node->children.n_idle);
 
-        if (node->children.concurrency)
+        if (node->children.concurrency != 0)
             storeAppendPrintf(sentry, " concurrency=%d", node->children.concurrency);
 
         if (node->cache)