1
0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00

* 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.
This commit is contained in:
David Shaw 2004-09-28 14:50:05 +00:00
parent a2599936c9
commit 793f8d8d55
3 changed files with 12 additions and 4 deletions

View File

@ -1,3 +1,11 @@
2004-09-28 David Shaw <dshaw@jabberwocky.com>
* 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 <wk@g10code.com> 2004-09-27 Werner Koch <wk@g10code.com>
* card-util.c (card_edit): Take admin only status from the table. * card-util.c (card_edit): Take admin only status from the table.

View File

@ -95,7 +95,7 @@ parse_keyserver_options(char *options)
#ifdef EXEC_TEMPFILE_ONLY #ifdef EXEC_TEMPFILE_ONLY
else if(ascii_strncasecmp(tok,"use-temp-files",14)==0 || else if(ascii_strncasecmp(tok,"use-temp-files",14)==0 ||
ascii_strncasecmp(tok,"no-use-temp-files",17)==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); " on this platform\n"),tok);
#else #else
else if(ascii_strncasecmp(tok,"use-temp-files",14)==0) else if(ascii_strncasecmp(tok,"use-temp-files",14)==0)
@ -462,7 +462,7 @@ parse_keyrec(char *keystring)
if((tok=strsep(&keystring,":"))==NULL) if((tok=strsep(&keystring,":"))==NULL)
return ret; return ret;
if(atoi(tok)<0) if(atoi(tok)<=0)
work->createtime=0; work->createtime=0;
else else
work->createtime=atoi(tok); work->createtime=atoi(tok);
@ -470,7 +470,7 @@ parse_keyrec(char *keystring)
if((tok=strsep(&keystring,":"))==NULL) if((tok=strsep(&keystring,":"))==NULL)
return ret; return ret;
if(atoi(tok)<0) if(atoi(tok)<=0)
work->expiretime=0; work->expiretime=0;
else else
{ {

View File

@ -93,7 +93,7 @@ got_fatal_signal( int sig )
s = log_get_name(); if( s ) write(2, s, strlen(s) ); s = log_get_name(); if( s ) write(2, s, strlen(s) );
write(2, ": ", 2 ); 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] : "?"; s = (sig >= 0 && sig < NSIG) ? sys_siglist[sig] : "?";
write (2, s, strlen(s) ); write (2, s, strlen(s) );
#else #else