[Pkg-gnupg-commit] [gnupg2] 17/185: dirmngr: This towel should better detect a changed resolv.conf.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit de3a0988ef9addccd6b5c7950fb8797afbc3978d
Author: Werner Koch <wk at gnupg.org>
Date:   Thu May 25 20:26:54 2017 +0200

    dirmngr: This towel should better detect a changed resolv.conf.
    
    * dirmngr/dns-stuff.c (resolv_conf_changed_p): Fix initialization time
    issue.
    --
    
    Fixes-commit: b5f356e9fba2d99909f8f54d7b7e6836bed87b68
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 dirmngr/dns-stuff.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index a8ddbc6..7324aae 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -407,21 +407,23 @@ resolv_conf_changed_p (void)
   static time_t last_mtime;
   const char *fname = RESOLV_CONF_NAME;
   struct stat statbuf;
-  int changed;
+  int changed = 0;
 
   if (stat (fname, &statbuf))
     {
       log_error ("stat'ing '%s' failed: %s\n",
                  fname, gpg_strerror (gpg_error_from_syserror ()));
-      changed = 0;
       last_mtime = 1; /* Force a "changed" result the next time stat
                        * works.  */
     }
-  else
+  else if (!last_mtime)
+    last_mtime = statbuf.st_mtime;
+  else if (last_mtime != statbuf.st_mtime)
     {
-      changed = last_mtime && (last_mtime != statbuf.st_mtime);
+      changed = 1;
       last_mtime = statbuf.st_mtime;
     }
+
   return changed;
 #endif
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git