mirror of
git://git.gnupg.org/gnupg.git
synced 2025-04-17 15:44:34 +02:00
assuan/
2001-12-14 Marcus Brinkmann <marcus@g10code.de> * assuan-buffer.c (_assuan_read_line): New variable ATTICLEN, use it to save the length of the attic line. Rediddle the code a bit to make it more clear what happens. agent/ 2001-12-19 Marcus Brinkmann <marcus@g10code.de> * query.c (start_pinentry): Add new argument to assuan_pipe_connect. sm/ 2001-12-19 Marcus Brinkmann <marcus@g10code.de> * call-agent.c (start_agent): Add new argument to assuan_pipe_connect.
This commit is contained in:
parent
86521773df
commit
84b6169de7
@ -1,3 +1,7 @@
|
|||||||
|
2001-12-19 Marcus Brinkmann <marcus@g10code.de>
|
||||||
|
|
||||||
|
* query.c (start_pinentry): Add new argument to assuan_pipe_connect.
|
||||||
|
|
||||||
2001-12-18 Werner Koch <wk@gnupg.org>
|
2001-12-18 Werner Koch <wk@gnupg.org>
|
||||||
|
|
||||||
* Makefile.am: Use LIBGCRYPT macros
|
* Makefile.am: Use LIBGCRYPT macros
|
||||||
|
@ -84,7 +84,7 @@ start_pinentry (void)
|
|||||||
argv[1] = NULL;
|
argv[1] = NULL;
|
||||||
|
|
||||||
/* connect to the pinentry and perform initial handshaking */
|
/* connect to the pinentry and perform initial handshaking */
|
||||||
rc = assuan_pipe_connect (&ctx, opt.pinentry_program, (char**)argv);
|
rc = assuan_pipe_connect (&ctx, opt.pinentry_program, (char**)argv, 0);
|
||||||
if (rc)
|
if (rc)
|
||||||
{
|
{
|
||||||
log_error ("can't connect to the PIN entry module: %s\n",
|
log_error ("can't connect to the PIN entry module: %s\n",
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2001-12-14 Marcus Brinkmann <marcus@g10code.de>
|
||||||
|
|
||||||
|
* assuan-buffer.c (_assuan_read_line): New variable ATTICLEN, use
|
||||||
|
it to save the length of the attic line.
|
||||||
|
Rediddle the code a bit to make it more clear what happens.
|
||||||
|
|
||||||
2001-12-14 Werner Koch <wk@gnupg.org>
|
2001-12-14 Werner Koch <wk@gnupg.org>
|
||||||
|
|
||||||
* assuan-listen.c (assuan_close_input_fd): New.
|
* assuan-listen.c (assuan_close_input_fd): New.
|
||||||
|
@ -71,9 +71,11 @@ writen ( int fd, const char *buffer, size_t length )
|
|||||||
|
|
||||||
/* Connect to a server over a pipe, creating the assuan context and
|
/* Connect to a server over a pipe, creating the assuan context and
|
||||||
returning it in CTX. The server filename is NAME, the argument
|
returning it in CTX. The server filename is NAME, the argument
|
||||||
vector in ARGV. */
|
vector in ARGV. FD_CHILD_LIST is a -1 terminated list of file
|
||||||
|
descriptors not to close in the child. */
|
||||||
AssuanError
|
AssuanError
|
||||||
assuan_pipe_connect (ASSUAN_CONTEXT *ctx, const char *name, char *const argv[])
|
assuan_pipe_connect (ASSUAN_CONTEXT *ctx, const char *name, char *const argv[],
|
||||||
|
int *fd_child_list)
|
||||||
{
|
{
|
||||||
static int fixed_signals = 0;
|
static int fixed_signals = 0;
|
||||||
AssuanError err;
|
AssuanError err;
|
||||||
@ -149,7 +151,16 @@ assuan_pipe_connect (ASSUAN_CONTEXT *ctx, const char *name, char *const argv[])
|
|||||||
n = MAX_OPEN_FDS;
|
n = MAX_OPEN_FDS;
|
||||||
for (i=0; i < n; i++)
|
for (i=0; i < n; i++)
|
||||||
{
|
{
|
||||||
if (i != fileno (stderr)
|
int *fdp = fd_child_list;
|
||||||
|
|
||||||
|
if (fdp)
|
||||||
|
{
|
||||||
|
while (*fdp != -1 && *fdp != i)
|
||||||
|
fdp++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!(fdp && *fdp != -1)
|
||||||
|
&& i != fileno (stderr)
|
||||||
#ifdef HAVE_JNLIB_LOGGING
|
#ifdef HAVE_JNLIB_LOGGING
|
||||||
&& i != log_fd
|
&& i != log_fd
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2001-12-19 Marcus Brinkmann <marcus@g10code.de>
|
||||||
|
|
||||||
|
* call-agent.c (start_agent): Add new argument to assuan_pipe_connect.
|
||||||
|
|
||||||
2001-12-18 Werner Koch <wk@gnupg.org>
|
2001-12-18 Werner Koch <wk@gnupg.org>
|
||||||
|
|
||||||
* verify.c (print_integer_sexp): Renamed from print_integer and
|
* verify.c (print_integer_sexp): Renamed from print_integer and
|
||||||
|
@ -163,7 +163,7 @@ start_agent (void)
|
|||||||
argv[2] = NULL;
|
argv[2] = NULL;
|
||||||
|
|
||||||
/* connect to the agent and perform initial handshaking */
|
/* connect to the agent and perform initial handshaking */
|
||||||
rc = assuan_pipe_connect (&ctx, opt.agent_program, (char**)argv);
|
rc = assuan_pipe_connect (&ctx, opt.agent_program, (char**)argv, 0);
|
||||||
if (rc)
|
if (rc)
|
||||||
{
|
{
|
||||||
log_error ("can't connect to the agent: %s\n", assuan_strerror (rc));
|
log_error ("can't connect to the agent: %s\n", assuan_strerror (rc));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user