diff options
| -rw-r--r-- | common/exechelp-posix.c | 2 | ||||
| -rw-r--r-- | common/exechelp-w32.c | 4 | ||||
| -rw-r--r-- | common/exechelp.h | 2 | ||||
| -rw-r--r-- | dirmngr/ldap-wrapper.c | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/common/exechelp-posix.c b/common/exechelp-posix.c index 6db7fdff1..7b20a3796 100644 --- a/common/exechelp-posix.c +++ b/common/exechelp-posix.c @@ -857,7 +857,7 @@ process_vctl (gnupg_process_t process, unsigned int request, va_list arg_ptr) case GNUPG_PROCESS_NOP: return 0; - case GNUPG_PROCESS_GET_ID: + case GNUPG_PROCESS_GET_PROC_ID: { int *r_id = va_arg (arg_ptr, int *); diff --git a/common/exechelp-w32.c b/common/exechelp-w32.c index 9da82304d..790e29b37 100644 --- a/common/exechelp-w32.c +++ b/common/exechelp-w32.c @@ -974,14 +974,14 @@ process_vctl (gnupg_process_t process, unsigned int request, va_list arg_ptr) case GNUPG_PROCESS_NOP: return 0; - case GNUPG_PROCESS_GET_ID: + case GNUPG_PROCESS_GET_PROC_ID: { int *r_id = va_arg (arg_ptr, int *); if (r_id == NULL) return GPG_ERR_INV_VALUE; - *r_id = (int)process->hProcess; + *r_id = (int)GetProcessId (process->hProcess); return 0; } diff --git a/common/exechelp.h b/common/exechelp.h index 7ef2234c8..398ef5d07 100644 --- a/common/exechelp.h +++ b/common/exechelp.h @@ -140,7 +140,7 @@ enum gnupg_process_requests { /* Portable requests */ GNUPG_PROCESS_NOP = 0, - GNUPG_PROCESS_GET_ID = 1, + GNUPG_PROCESS_GET_PROC_ID = 1, GNUPG_PROCESS_GET_EXIT_ID = 2, /* POSIX only */ diff --git a/dirmngr/ldap-wrapper.c b/dirmngr/ldap-wrapper.c index 1a3c50087..205ca6b22 100644 --- a/dirmngr/ldap-wrapper.c +++ b/dirmngr/ldap-wrapper.c @@ -445,8 +445,8 @@ ldap_reaper_thread (void *dummy) { int status; - gnupg_process_ctl (ctx->proc, - GNUPG_PROCESS_GET_EXIT_ID, &status); + gnupg_process_ctl (ctx->proc, GNUPG_PROCESS_GET_EXIT_ID, + &status); if (DBG_EXTPROG) log_info (_("ldap wrapper %d ready"), (int)ctx->printable_pid); ctx->ready = 1; @@ -861,7 +861,7 @@ ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[]) } gnupg_process_get_streams (process, GNUPG_PROCESS_STREAM_NONBLOCK, NULL, &outfp, &errfp); - gnupg_process_ctl (process, GNUPG_PROCESS_GET_ID, &ctx->printable_pid); + gnupg_process_ctl (process, GNUPG_PROCESS_GET_PROC_ID, &ctx->printable_pid); ctx->proc = process; ctx->fp = outfp; |