mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* b64enc.c: Include stdio.h and string.h
* gpgsm.c: New option --prefer-system-dirmngr. * call-dirmngr.c (start_dirmngr): Implement this option. * gpgconf-comp.c <dirmngr>: Add the proxy options. <gpgsm>: Add --prefer-system-daemon.
This commit is contained in:
parent
a2ecb6285e
commit
c7b97075aa
16 changed files with 131 additions and 38 deletions
|
@ -35,6 +35,7 @@
|
|||
#include <time.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/un.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
|
@ -411,9 +412,12 @@ log_get_prefix (unsigned int *flags)
|
|||
int
|
||||
log_test_fd (int fd)
|
||||
{
|
||||
int tmp = fileno (logstream);
|
||||
if ( tmp != -1 && tmp == fd)
|
||||
return 1;
|
||||
if (logstream)
|
||||
{
|
||||
int tmp = fileno (logstream);
|
||||
if ( tmp != -1 && tmp == fd)
|
||||
return 1;
|
||||
}
|
||||
if (log_socket != -1 && log_socket == fd)
|
||||
return 1;
|
||||
return 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue