diff options
| author | Werner Koch <[email protected]> | 2008-03-20 15:31:43 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2008-03-20 15:31:43 +0000 |
| commit | c2a8254be71089f707b3100972609db9cf4d02a0 (patch) | |
| tree | 109ea1f31fdfe85524fca8107edbab7a5888f425 /agent | |
| parent | Fix for v3 keys. (diff) | |
| download | gnupg-c2a8254be71089f707b3100972609db9cf4d02a0.tar.gz gnupg-c2a8254be71089f707b3100972609db9cf4d02a0.zip | |
Fix a bug in the ambigious name detection.
Minor cleanups.
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/ChangeLog | 6 | ||||
| -rw-r--r-- | agent/agent.h | 1 | ||||
| -rw-r--r-- | agent/call-pinentry.c | 4 | ||||
| -rw-r--r-- | agent/command.c | 6 |
4 files changed, 13 insertions, 4 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index 6a0006817..d48d13a7e 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,9 @@ +2008-03-17 Werner Koch <[email protected]> + + * agent.h (agent_inq_pinentry_launched): New prototype. + + * call-pinentry.c: Include sys/types.h and signal.h. + 2008-02-14 Werner Koch <[email protected]> * command.c (agent_inq_pinentry_launched): New. diff --git a/agent/agent.h b/agent/agent.h index f824fe615..bf460b485 100644 --- a/agent/agent.h +++ b/agent/agent.h @@ -211,6 +211,7 @@ void *get_agent_scd_notify_event (void); void agent_sighup_action (void); /*-- command.c --*/ +gpg_error_t agent_inq_pinentry_launched (ctrl_t ctrl, unsigned long pid); gpg_error_t agent_write_status (ctrl_t ctrl, const char *keyword, ...); void bump_key_eventcounter (void); void bump_card_eventcounter (void); diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c index 8b9f2afd4..6ae31030d 100644 --- a/agent/call-pinentry.c +++ b/agent/call-pinentry.c @@ -27,7 +27,9 @@ #include <unistd.h> #include <sys/stat.h> #ifndef HAVE_W32_SYSTEM -#include <sys/wait.h> +# include <sys/wait.h> +# include <sys/types.h> +# include <signal.h> #endif #include <pth.h> #include <assuan.h> diff --git a/agent/command.c b/agent/command.c index 9c2b8b7f9..720272904 100644 --- a/agent/command.c +++ b/agent/command.c @@ -320,9 +320,9 @@ agent_write_status (ctrl_t ctrl, const char *keyword, ...) } -/* Helper to notify the client about a lauchned Pinentry. Because - that might disturb some older clients, this is only done when - enabled via an option. Returns an gpg error code. */ +/* Helper to notify the client about a launched Pinentry. Because + that might disturb some older clients, this is only done if enabled + via an option. Returns an gpg error code. */ gpg_error_t agent_inq_pinentry_launched (ctrl_t ctrl, unsigned long pid) { |