diff options
author | Werner Koch <wk@gnupg.org> | 2005-02-03 18:40:02 +0100 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2005-02-03 18:40:02 +0100 |
commit | b326996b784b561ab56af5b41037f60ae8a79849 (patch) | |
tree | 01ced87c39b865a5cb754985217c6692f5fa3097 /agent/agent.h | |
parent | Forgot to commit the recent fixed to scd and logging - doing it now (diff) | |
download | gnupg2-b326996b784b561ab56af5b41037f60ae8a79849.tar.xz gnupg2-b326996b784b561ab56af5b41037f60ae8a79849.zip |
* AUTHORS: Copied from 1.4 and edited to refelct the changes in
1.9.
* agent.h (agent_exit): Add JNLIB_GCC_A_NR to indicate that this
function won't return.
* gpg-agent.c (check_for_running_agent): Initialize pid to a
default value if not needed.
* command-ssh.c: Removed stdint.h. s/byte_t/unsigned char/,
s/uint32/u32/ becuase that is what we have always used in GnuPG.
(ssh_request_specs): Moved to top of file.
(ssh_key_types): Ditto.
(make_cstring): Ditto.
(data_sign): Don't use a variable for the passphrase prompt, make
it translatable.
(ssh_request_process):
* findkey.c (modify_description): Renamed arguments for clarity,
polished documentation. Make comment a C-string. Fixed case of
DESCRIPTION being just "%".
(agent_key_from_file): Make sure comment string to a C-string.
* gpg-agent.c (create_socket_name): Cleanup the implemntation, use
DIMof, agent_exit, removed superflous args and return the
allocated string as value. Documented. Changed callers.
(create_server_socket): Cleanups similar to above. Changed callers.
(cleanup_do): Renamed to ..
(remove_socket): .. this. Changed caller.
(handle_connections): The signals are to be handled in the select
and not in the accept. Test all FDs after returning from a
select. Remove the event tests from the accept calls. The select
already assured that the accept won't block.
Diffstat (limited to 'agent/agent.h')
-rw-r--r-- | agent/agent.h | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/agent/agent.h b/agent/agent.h index 8afda6463..a1196bc0b 100644 --- a/agent/agent.h +++ b/agent/agent.h @@ -47,26 +47,28 @@ out_of_core (void) /* A large struct name "opt" to keep global flags */ struct { - unsigned int debug; /* debug flags (DBG_foo_VALUE) */ - int verbose; /* verbosity level */ - int quiet; /* be as quiet as possible */ - int dry_run; /* don't change any persistent data */ - int batch; /* batch mode */ - const char *homedir; /* configuration directory name */ - const char *pinentry_program; - const char *scdaemon_program; - int no_grab; /* don't let the pinentry grab the keyboard */ + unsigned int debug; /* Debug flags (DBG_foo_VALUE) */ + int verbose; /* Verbosity level */ + int quiet; /* Be as quiet as possible */ + int dry_run; /* Don't change any persistent data */ + int batch; /* Batch mode */ + const char *homedir; /* Configuration directory name */ + const char *pinentry_program; /* Filename of the program to start as + pinentry. */ + const char *scdaemon_program; /* Filename of the program to handle + smartcard tasks. */ + int no_grab; /* Don't let the pinentry grab the keyboard */ unsigned long def_cache_ttl; unsigned long max_cache_ttl; - int running_detached; /* we are running detached from the tty. */ + int running_detached; /* We are running detached from the tty. */ int ignore_cache_for_signing; int allow_mark_trusted; int allow_preset_passphrase; - int keep_tty; /* don't switch the TTY (for pinentry) on request */ - int keep_display; /* don't switch the DISPLAY (for pinentry) on request */ - int ssh_support; /* Enable ssh-agent emulation. */ + int keep_tty; /* Don't switch the TTY (for pinentry) on request */ + int keep_display; /* Don't switch the DISPLAY (for pinentry) on request */ + int ssh_support; /* Enable ssh-agent emulation. */ } opt; @@ -131,7 +133,7 @@ enum { }; /*-- gpg-agent.c --*/ -void agent_exit (int rc); /* also implemented in other tools */ +void agent_exit (int rc) JNLIB_GCC_A_NR; /* Also implemented in other tools */ void agent_init_default_ctrl (struct server_control_s *ctrl); /*-- command.c --*/ |