[Pkg-gnupg-commit] [gnupg2] 113/159: kbx: Improve and fix keybox_lock.

[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 8f1368d5e3f7654ad9cb100053535f728dff2344
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jan 13 14:47:06 2016 +0100

    kbx: Improve and fix keybox_lock.
    
    * kbx/keybox-init.c (keybox_lock): Make sure ERR is initialized.  Get
    error codes from dotlock functions.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 kbx/keybox-init.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/kbx/keybox-init.c b/kbx/keybox-init.c
index cfee7b8..01d29f0 100644
--- a/kbx/keybox-init.c
+++ b/kbx/keybox-init.c
@@ -266,10 +266,10 @@ _keybox_close_file (KEYBOX_HANDLE hd)
 gpg_error_t
 keybox_lock (KEYBOX_HANDLE hd, int yes)
 {
-  gpg_error_t err;
+  gpg_error_t err = 0;
   KB_NAME kb = hd->kb;
 
-  if (!keybox_is_writable ((void*)kb))
+  if (!keybox_is_writable (kb))
     return 0;
 
   /* Make sure the lock handle has been created.  */
@@ -278,9 +278,9 @@ keybox_lock (KEYBOX_HANDLE hd, int yes)
       kb->lockhd = dotlock_create (kb->fname, 0);
       if (!kb->lockhd)
         {
-          /* Unfortuntaley dotlock_create does not properly set ERRNO.  */
+          err = gpg_error_from_syserror ();
           log_info ("can't allocate lock for '%s'\n", kb->fname );
-          return gpg_error (GPG_ERR_GENERAL);
+          return err;
         }
     }
 
@@ -288,28 +288,26 @@ keybox_lock (KEYBOX_HANDLE hd, int yes)
     {
       if (kb->is_locked)
         ;
-      else if (!dotlock_take (kb->lockhd, -1))
-        kb->is_locked = 1;
-      else
+      else if (dotlock_take (kb->lockhd, -1))
         {
-          /* Unfortuntaley dotlock_take does not properly set ERRNO.  */
+          err = gpg_error_from_syserror ();
           log_info ("can't lock '%s'\n", kb->fname );
-          err = gpg_error (GPG_ERR_GENERAL);
         }
+      else
+        kb->is_locked = 1;
     }
   else /* Release the lock.  */
     {
       if (!kb->is_locked)
         ;
-      else if (!dotlock_release (kb->lockhd))
-        kb->is_locked = 0;
-      else
+      else if (dotlock_release (kb->lockhd))
         {
-          /* Unfortuntaley dotlock_release does not properly set ERRNO.  */
+          err = gpg_error_from_syserror ();
           log_info ("can't unlock '%s'\n", kb->fname );
-          err = gpg_error (GPG_ERR_GENERAL);
         }
-    }
+      else
+        kb->is_locked = 0;
+   }
 
   return err;
 }

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