diff options
| author | Werner Koch <wk@gnupg.org> | 2005-05-31 22:03:04 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2005-05-31 22:03:04 +0200 |
| commit | 6e522257a9beb9e7b12888533c9274f1e198ff0d (patch) | |
| tree | 7c70e9dc88e5898e121f5f76146b79c62ac3adf4 /agent | |
| parent | 2005-05-28 Moritz Schulte <moritz@g10code.com> (diff) | |
| download | gnupg2-6e522257a9beb9e7b12888533c9274f1e198ff0d.tar.xz gnupg2-6e522257a9beb9e7b12888533c9274f1e198ff0d.zip | |
* agent.h (out_of_core): s/__inline__/inine. Noted by Ray Link.
* dynload.h: s/__inline__/inline/.
* tlv.c [GNUPG_MAJOR_VERSION==1]: Define constants instead of
including a gnupg 1.4 header.
* watchgnupg.c: Make sure that PF_LCOAL and AF_LOCAL are defines.
Noted by Ray Link.
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/ChangeLog | 9 | ||||
| -rw-r--r-- | agent/agent.h | 2 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 8 |
3 files changed, 15 insertions, 4 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index dcf0cdfd3..86f62be48 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,12 @@ +2005-05-31 Werner Koch <wk@g10code.com> + + * agent.h (out_of_core): s/__inline__/inine. Noted by Ray Link. + +2005-05-25 Werner Koch <wk@g10code.com> + + * gpg-agent.c (main): Do not unset the DISPLAY when we are + continuing as child. + 2005-05-24 Werner Koch <wk@g10code.com> * call-scd.c (inq_needpin): Skip leading spaces in of PIN diff --git a/agent/agent.h b/agent/agent.h index e416914cf..a667c0d46 100644 --- a/agent/agent.h +++ b/agent/agent.h @@ -37,7 +37,7 @@ /* Convenience function to be used instead of returning the old GNUPG_Out_Of_Core. */ -static __inline__ gpg_error_t +static inline gpg_error_t out_of_core (void) { return gpg_error (gpg_err_code_from_errno (errno)); diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index e3e952906..c793e7eab 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -490,7 +490,7 @@ main (int argc, char **argv ) opt.homedir = default_homedir (); - /* Record the some original Denvironment settings. */ + /* Record some of the original environment strings. */ opt.startup_display = getenv ("DISPLAY"); if (opt.startup_display) opt.startup_display = xstrdup (opt.startup_display); @@ -776,9 +776,11 @@ main (int argc, char **argv ) /* Remove the DISPLAY variable so that a pinentry does not default to a specific display. There is still a default display when gpg-agent was started using --display or a - client requested this using an OPTION command. */ + client requested this using an OPTION command. Note, that we + don't do this when running in reverse daemon mode (i.e. when + exec the program given as arguments). */ #ifndef HAVE_W32_SYSTEM - if (!opt.keep_display) + if (!opt.keep_display && !argc) unsetenv ("DISPLAY"); #endif |