mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* 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.
This commit is contained in:
parent
c8efd2bf77
commit
6e522257a9
11 changed files with 60 additions and 9 deletions
|
@ -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
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue