diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/ChangeLog | 8 | ||||
| -rw-r--r-- | common/asshelp.c | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/common/ChangeLog b/common/ChangeLog index 1f5637845..dd8c0a3a2 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,9 @@ +2010-06-24 Werner Koch <[email protected]> + + * 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 <[email protected]> * 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 ... diff --git a/common/asshelp.c b/common/asshelp.c index bd7aa8de9..882c15479 100644 --- a/common/asshelp.c +++ b/common/asshelp.c @@ -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); |