diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 8 | ||||
| -rw-r--r-- | g10/keyserver.c | 6 | ||||
| -rw-r--r-- | g10/signal.c | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index e51bb46a9..d051aac02 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,11 @@ +2004-09-28 David Shaw <[email protected]> + + * signal.c (got_fatal_signal): HAVE_DECL_SYS_SIGLIST is defined, + but zero if not found. Noted by John Clizbe. + + * keyserver.c (parse_keyrec): Fix problem with non-expiring keys + appearing expired in --search-keys results. + 2004-09-27 Werner Koch <[email protected]> * card-util.c (card_edit): Take admin only status from the table. diff --git a/g10/keyserver.c b/g10/keyserver.c index ab3c18dab..e299203c2 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -95,7 +95,7 @@ parse_keyserver_options(char *options) #ifdef EXEC_TEMPFILE_ONLY else if(ascii_strncasecmp(tok,"use-temp-files",14)==0 || ascii_strncasecmp(tok,"no-use-temp-files",17)==0) - log_info(_("WARNING: keyserver option %s is not used" + log_info(_("WARNING: keyserver option `%s' is not used" " on this platform\n"),tok); #else else if(ascii_strncasecmp(tok,"use-temp-files",14)==0) @@ -462,7 +462,7 @@ parse_keyrec(char *keystring) if((tok=strsep(&keystring,":"))==NULL) return ret; - if(atoi(tok)<0) + if(atoi(tok)<=0) work->createtime=0; else work->createtime=atoi(tok); @@ -470,7 +470,7 @@ parse_keyrec(char *keystring) if((tok=strsep(&keystring,":"))==NULL) return ret; - if(atoi(tok)<0) + if(atoi(tok)<=0) work->expiretime=0; else { diff --git a/g10/signal.c b/g10/signal.c index 44c8a8f21..0f904ed97 100644 --- a/g10/signal.c +++ b/g10/signal.c @@ -93,7 +93,7 @@ got_fatal_signal( int sig ) s = log_get_name(); if( s ) write(2, s, strlen(s) ); write(2, ": ", 2 ); -#if defined(HAVE_DECL_SYS_SIGLIST) && defined(NSIG) +#if HAVE_DECL_SYS_SIGLIST && defined(NSIG) s = (sig >= 0 && sig < NSIG) ? sys_siglist[sig] : "?"; write (2, s, strlen(s) ); #else |