mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Fix a regression from 2010-06-09.
This commit is contained in:
parent
1e7b03ef25
commit
c8bafe218c
8 changed files with 29 additions and 12 deletions
|
@ -1,3 +1,9 @@
|
|||
2010-06-24 Werner Koch <wk@g10code.com>
|
||||
|
||||
* asshelp.c (lock_agent_spawning) [W32]: Use CreateMutexW.
|
||||
(start_new_gpg_agent): Use HANG option for gnupg_wait_progress.
|
||||
Fixes regression from 2010-06-09.
|
||||
|
||||
2010-06-21 Werner Koch <wk@g10code.com>
|
||||
|
||||
* util.h (xfree_fnc): New.
|
||||
|
@ -41,7 +47,7 @@
|
|||
* util.h (GNUPG_MODULE_NAME_DIRMNGR_LDAP): New.
|
||||
* homedir.c (gnupg_cachedir): New.
|
||||
(w32_try_mkdir): New.
|
||||
(dirmngr_socket_name): Chanmge standard socket name.
|
||||
(dirmngr_socket_name): Change standard socket name.
|
||||
(gnupg_module_name): Support GNUPG_MODULE_NAME_DIRMNGR_LDAP.
|
||||
|
||||
* logging.c (log_set_get_tid_callback): Replace by ...
|
||||
|
|
|
@ -226,7 +226,7 @@ lock_agent_spawning (lock_agent_t *lock, const char *homedir)
|
|||
|
||||
(void)homedir; /* Not required. */
|
||||
|
||||
*lock = CreateMutex (NULL, FALSE, "GnuPG_spawn_agent_sentinel");
|
||||
*lock = CreateMutexW (NULL, FALSE, L"GnuPG_spawn_agent_sentinel");
|
||||
if (!*lock)
|
||||
{
|
||||
log_error ("failed to create the spawn_agent mutex: %s\n",
|
||||
|
@ -362,10 +362,10 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
|
|||
if (err)
|
||||
log_debug ("starting `%s' for testing failed: %s\n",
|
||||
agent_program, gpg_strerror (err));
|
||||
else if ((err = gnupg_wait_process (agent_program, pid, 0, &excode)))
|
||||
else if ((err = gnupg_wait_process (agent_program, pid, 1, &excode)))
|
||||
{
|
||||
if (excode == -1)
|
||||
log_debug ("running `%s' for testing failed: %s\n",
|
||||
log_debug ("running `%s' for testing failed (wait): %s\n",
|
||||
agent_program, gpg_strerror (err));
|
||||
}
|
||||
gnupg_release_process (pid);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue