[Pkg-gnupg-commit] [gnupg2] 279/292: g10: Fix flags to open for lock of ToFU.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gnupg2.

commit 1c0b140cccfb884c6d07785c3284b9df06dccd3c
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Nov 18 20:32:22 2016 +0900

    g10: Fix flags to open for lock of ToFU.
    
    * g10/tofu.c (busy_handler): Fix the flags and utime is not needed.
    
    --
    
    The argument flags must include one of O_RDONLY, O_WRONLY, or O_RDWR.
    Adding O_TRUNC, the file is updated.  So, utime is not needed.
    
    Fixes-commit: b2e1b17efa952afcf7aeec8b15e9d0088dba587a
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
 g10/tofu.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/g10/tofu.c b/g10/tofu.c
index cf1d00a..2c9d17c 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -732,16 +732,13 @@ busy_handler (void *cookie, int call_count)
          process will have to wait a bit longer, but otherwise nothing
          horrible should happen.  */
 
-      int fd = open (dbs->want_lock_file, O_CREAT,
+      int fd = open (dbs->want_lock_file, O_CREAT|O_WRONLY|O_TRUNC,
                      S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR);
       if (fd == -1)
         log_debug ("TOFU: Error opening '%s': %s\n",
                    dbs->want_lock_file, strerror (errno));
       else
-        {
-          utime (dbs->want_lock_file, NULL);
-          close (fd);
-        }
+        close (fd);
     }
 
   /* Call again.  */

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