diff options
| author | Werner Koch <wk@gnupg.org> | 2004-11-23 18:09:51 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2004-11-23 18:09:51 +0100 |
| commit | c7b97075aa213a7ac54b8c56679719679816b3fa (patch) | |
| tree | 04945dddc36984039b8b403f7eabbb7852cfe53c /jnlib | |
| parent | Post release preparations (diff) | |
| download | gnupg2-c7b97075aa213a7ac54b8c56679719679816b3fa.tar.xz gnupg2-c7b97075aa213a7ac54b8c56679719679816b3fa.zip | |
* 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.
Diffstat (limited to 'jnlib')
| -rw-r--r-- | jnlib/ChangeLog | 9 | ||||
| -rw-r--r-- | jnlib/logging.c | 10 |
2 files changed, 16 insertions, 3 deletions
diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog index 3c2d6d84a..517cfb73f 100644 --- a/jnlib/ChangeLog +++ b/jnlib/ChangeLog @@ -1,3 +1,12 @@ +2004-11-22 Werner Koch <wk@g10code.com> + + * logging.c (log_test_fd): Add test on LOGSTREAM. Reported by + Barry Schwartz. + +2004-11-18 Werner Koch <wk@g10code.com> + + * logging.c: Explicitly include sys/stat.h for the S_I* constants. + 2004-10-21 Werner Koch <wk@g10code.com> * logging.c (do_logv): Use set_log_stream to setup a default. diff --git a/jnlib/logging.c b/jnlib/logging.c index 7a5e1552e..5397a1184 100644 --- a/jnlib/logging.c +++ b/jnlib/logging.c @@ -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; |