mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
Fix bug 1285
This commit is contained in:
parent
9b230eadc8
commit
a384e94b73
2
NEWS
2
NEWS
@ -3,6 +3,8 @@ Noteworthy changes in version 2.0.17 (unreleased)
|
|||||||
|
|
||||||
* Fixed output of "gpgconf --check-options".
|
* Fixed output of "gpgconf --check-options".
|
||||||
|
|
||||||
|
* gpg-agent now tests for a newly created gpg-agent.conf after a HUP.
|
||||||
|
|
||||||
|
|
||||||
Noteworthy changes in version 2.0.16 (2010-07-19)
|
Noteworthy changes in version 2.0.16 (2010-07-19)
|
||||||
-------------------------------------------------
|
-------------------------------------------------
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2010-09-24 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
|
* gpg-agent.c (main, reread_configuration): Always test whether
|
||||||
|
the default configuration file has been created in the meantime.
|
||||||
|
Fixes bug#1285.
|
||||||
|
|
||||||
2010-08-11 Werner Koch <wk@g10code.com>
|
2010-08-11 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
* call-pinentry.c (agent_askpin, agent_get_passphrase): Fix
|
* call-pinentry.c (agent_askpin, agent_get_passphrase): Fix
|
||||||
|
@ -724,6 +724,12 @@ main (int argc, char **argv )
|
|||||||
if( parse_debug )
|
if( parse_debug )
|
||||||
log_info (_("NOTE: no default option file `%s'\n"),
|
log_info (_("NOTE: no default option file `%s'\n"),
|
||||||
configname );
|
configname );
|
||||||
|
/* Save the default conf file name so that
|
||||||
|
reread_configuration is able to test whether the
|
||||||
|
config file has been created in the meantime. */
|
||||||
|
xfree (config_filename);
|
||||||
|
config_filename = configname;
|
||||||
|
configname = NULL;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -811,10 +817,15 @@ main (int argc, char **argv )
|
|||||||
fclose( configfp );
|
fclose( configfp );
|
||||||
configfp = NULL;
|
configfp = NULL;
|
||||||
/* Keep a copy of the name so that it can be read on SIGHUP. */
|
/* Keep a copy of the name so that it can be read on SIGHUP. */
|
||||||
|
if (config_filename != configname)
|
||||||
|
{
|
||||||
|
xfree (config_filename);
|
||||||
config_filename = configname;
|
config_filename = configname;
|
||||||
|
}
|
||||||
configname = NULL;
|
configname = NULL;
|
||||||
goto next_pass;
|
goto next_pass;
|
||||||
}
|
}
|
||||||
|
|
||||||
xfree (configname);
|
xfree (configname);
|
||||||
configname = NULL;
|
configname = NULL;
|
||||||
if (log_get_errorcount(0))
|
if (log_get_errorcount(0))
|
||||||
@ -1332,7 +1343,7 @@ reread_configuration (void)
|
|||||||
fp = fopen (config_filename, "r");
|
fp = fopen (config_filename, "r");
|
||||||
if (!fp)
|
if (!fp)
|
||||||
{
|
{
|
||||||
log_error (_("option file `%s': %s\n"),
|
log_info (_("option file `%s': %s\n"),
|
||||||
config_filename, strerror(errno) );
|
config_filename, strerror(errno) );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
@command{gpgsm} is a tool similar to @command{gpg} to provide digital
|
@command{gpgsm} is a tool similar to @command{gpg} to provide digital
|
||||||
encryption and signing services on X.509 certificates and the CMS
|
encryption and signing services on X.509 certificates and the CMS
|
||||||
protocol. It is mainly used as a backend for S/MIME mail processing.
|
protocol. It is mainly used as a backend for S/MIME mail processing.
|
||||||
@command{gpgsm} includes a full features certificate management and
|
@command{gpgsm} includes a full featured certificate management and
|
||||||
complies with all rules defined for the German Sphinx project.
|
complies with all rules defined for the German Sphinx project.
|
||||||
|
|
||||||
@manpause
|
@manpause
|
||||||
@ -286,7 +286,7 @@ smartcard is not yet supported.
|
|||||||
@node GPGSM Options
|
@node GPGSM Options
|
||||||
@section Option Summary
|
@section Option Summary
|
||||||
|
|
||||||
@command{GPGSM} comes features a bunch of options to control the exact behaviour
|
@command{GPGSM} features a bunch of options to control the exact behaviour
|
||||||
and to change the default configuration.
|
and to change the default configuration.
|
||||||
|
|
||||||
@menu
|
@menu
|
||||||
|
@ -207,6 +207,9 @@ get_manufacturer (unsigned int no)
|
|||||||
case 0x0005: return "ZeitControl";
|
case 0x0005: return "ZeitControl";
|
||||||
|
|
||||||
case 0x002A: return "Magrathea";
|
case 0x002A: return "Magrathea";
|
||||||
|
|
||||||
|
case 0xF517: return "FSIJ";
|
||||||
|
|
||||||
/* 0x00000 and 0xFFFF are defined as test cards per spec,
|
/* 0x00000 and 0xFFFF are defined as test cards per spec,
|
||||||
0xFFF00 to 0xFFFE are assigned for use with randomly created
|
0xFFF00 to 0xFFFE are assigned for use with randomly created
|
||||||
serial numbers. */
|
serial numbers. */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user