- Fix #840: infinite loop in unbound_munin_ plugin on unowned lockfile.

git-svn-id: file:///svn/unbound/trunk@3873 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/contrib/unbound_munin_ b/contrib/unbound_munin_
index 69e9f31163ca4c93e1c43525af44c6a3880da3ff..df76a9fcf995c6ad129b31eb203d6e0586e69b62 100755 (executable)
--- a/contrib/unbound_munin_
+++ b/contrib/unbound_munin_
@@ -150,7 +150,7 @@ get_state ( ) {
                        fi
                done
                # try to get it
-               echo $$ >$lock
+               if echo $$ >$lock ; then : ; else break; fi
        done
        # do not refetch if the file exists and only LEE seconds old
        if test -f $state; then

diff --git a/doc/Changelog b/doc/Changelog
index 2dcaa4650907ab6ab9eb2aec8490cb60f0a5050a..0602700d9a80dedbaa3e03f5fe05c37f2847bdeb 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 29 September 2016: Wouter
        - Fix #838: 1.5.10 cannot be built on Solaris, undefined PATH_MAX.
        - Fix #839: Memory grows unexpectedly with large RPZ files.
+       - Fix #840: infinite loop in unbound_munin_ plugin on unowned lockfile.
 
 27 September 2016: Wouter
        - tag for 1.5.10 release