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 7319ccedcc873b91784bdc16e88c30c9a9fa04a3..0cda978351689501d81e9544e2567025171601f4 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -810,7 +810,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 779c3b2c693a048a5faea9593db3ab8f90368f4a..4a20ae93369abfcd5c6433ab4303430ee5f1bd14 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -378,13 +378,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)