security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Reset the context lock flag after a failed dirmngr start which may happend 

due to --disable-dirmngr.
This commit is contained in:
Werner Koch 2008-10-17 13:12:11 +00:00
parent b519a52cea
commit dd96bd44d4
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sm/ChangeLog
View File

@ -1,3 +1,10 @@
2008-10-17 Werner Koch <wk@g10code.com>
* call-dirmngr.c (start_dirmngr, start_dirmngr2): Reset the lock
flag on error.
(release_dirmngr, release_dirmngr2): Replace asserts by error messages.
(gpgsm_dirmngr_lookup): Replace assert by fatal error message.
2008-10-13 Werner Koch <wk@g10code.com> 2008-10-13 Werner Koch <wk@g10code.com>
* gpgsm.c: Add alias --delete-keys. * gpgsm.c: Add alias --delete-keys.

35
sm/call-dirmngr.c
View File

@ -141,7 +141,7 @@ get_membuf (struct membuf *mb, size_t *len)
} }
/* This fucntion prepares the dirmngr for a new session. The /* This function prepares the dirmngr for a new session. The
audit-events option is used so that other dirmngr clients won't get audit-events option is used so that other dirmngr clients won't get
disturbed by such events. */ disturbed by such events. */
static void static void
@ -320,17 +320,27 @@ start_dirmngr_ext (ctrl_t ctrl, assuan_context_t *ctx_r)
static int static int
start_dirmngr (ctrl_t ctrl) start_dirmngr (ctrl_t ctrl)
{ {
gpg_error_t err;
assert (! dirmngr_ctx_locked); assert (! dirmngr_ctx_locked);
dirmngr_ctx_locked = 1; dirmngr_ctx_locked = 1;
return start_dirmngr_ext (ctrl, &dirmngr_ctx); err = start_dirmngr_ext (ctrl, &dirmngr_ctx);
/* We do not check ERR but the existance of a context because the
error might come from a failed command send to the dirmngr.
Fixme: Why don't we close the drimngr context if we encountered
an error in prepare_dirmngr? */
if (!dirmngr_ctx)
dirmngr_ctx_locked = 0;
return err;
} }
static void static void
release_dirmngr (ctrl_t ctrl) release_dirmngr (ctrl_t ctrl)
{ {
assert (dirmngr_ctx_locked); if (!dirmngr_ctx_locked)
log_error ("WARNING: trying to release a non-locked dirmngr ctx\n");
dirmngr_ctx_locked = 0; dirmngr_ctx_locked = 0;
} }
@ -338,17 +348,23 @@ release_dirmngr (ctrl_t ctrl)
static int static int
start_dirmngr2 (ctrl_t ctrl) start_dirmngr2 (ctrl_t ctrl)
{ {
gpg_error_t err;
assert (! dirmngr2_ctx_locked); assert (! dirmngr2_ctx_locked);
dirmngr2_ctx_locked = 1; dirmngr2_ctx_locked = 1;
return start_dirmngr_ext (ctrl, &dirmngr2_ctx); err = start_dirmngr_ext (ctrl, &dirmngr2_ctx);
if (!dirmngr2_ctx)
dirmngr2_ctx_locked = 0;
return err;
} }
static void static void
release_dirmngr2 (ctrl_t ctrl) release_dirmngr2 (ctrl_t ctrl)
{ {
assert (dirmngr2_ctx_locked); if (!dirmngr2_ctx_locked)
log_error ("WARNING: trying to release a non-locked dirmngr2 ctx\n");
dirmngr2_ctx_locked = 0; dirmngr2_ctx_locked = 0;
} }
@ -780,21 +796,24 @@ gpgsm_dirmngr_lookup (ctrl_t ctrl, strlist_t names, int cache_only,
/* The lookup function can be invoked from the callback of a lookup /* The lookup function can be invoked from the callback of a lookup
function, for example to walk the chain. */ function, for example to walk the chain. */
assert (!dirmngr_ctx_locked || !dirmngr2_ctx_locked); if (!dirmngr_ctx_locked)
if (! dirmngr_ctx_locked)
{ {
rc = start_dirmngr (ctrl); rc = start_dirmngr (ctrl);
if (rc) if (rc)
return rc; return rc;
ctx = dirmngr_ctx; ctx = dirmngr_ctx;
} }
else else if (!dirmngr2_ctx_locked)
{ {
rc = start_dirmngr2 (ctrl); rc = start_dirmngr2 (ctrl);
if (rc) if (rc)
return rc; return rc;
ctx = dirmngr2_ctx; ctx = dirmngr2_ctx;
} }
else
{
log_fatal ("both dirmngr contexts are in use\n");
}
pattern = pattern_from_strlist (names); pattern = pattern_from_strlist (names);
if (!pattern) if (!pattern)