0010-Log-warning-on-very-large-cachesize-config-instead-o.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From 1f1873aadd092a0fab505dd278a484d887ba0ec3 Mon Sep 17 00:00:00 2001
  2. From: Simon Kelley <[email protected]>
  3. Date: Fri, 11 May 2018 23:38:23 +0100
  4. Subject: [PATCH 10/17] Log warning on very large cachesize config, instead of
  5. truncating it.
  6. Signed-off-by: Kevin Darbyshire-Bryant <[email protected]>
  7. ---
  8. src/dnsmasq.c | 6 +++++-
  9. src/option.c | 2 --
  10. 2 files changed, 5 insertions(+), 3 deletions(-)
  11. --- a/src/dnsmasq.c
  12. +++ b/src/dnsmasq.c
  13. @@ -740,7 +740,11 @@ int main (int argc, char **argv)
  14. else
  15. {
  16. if (daemon->cachesize != 0)
  17. - my_syslog(LOG_INFO, _("started, version %s cachesize %d"), VERSION, daemon->cachesize);
  18. + {
  19. + my_syslog(LOG_INFO, _("started, version %s cachesize %d"), VERSION, daemon->cachesize);
  20. + if (daemon->cachesize > 10000)
  21. + my_syslog(LOG_WARNING, _("cache size greater than 10000 may cause performance issues, and is unlikely to be useful."));
  22. + }
  23. else
  24. my_syslog(LOG_INFO, _("started, version %s cache disabled"), VERSION);
  25. --- a/src/option.c
  26. +++ b/src/option.c
  27. @@ -2603,8 +2603,6 @@ static int one_opt(int option, char *arg
  28. if (size < 0)
  29. size = 0;
  30. - else if (size > 10000)
  31. - size = 10000;
  32. daemon->cachesize = size;
  33. }