security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* g10.c (main): Try to use "gpg.conf" as default option file.

Browse source 
* openfile.c (copy_options_file): Changed name of created file.
This commit is contained in:
Werner Koch 2002-08-06 13:29:27 +00:00
parent 181dcc69f4
commit a1259acdcb
3 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
g10/g10.c
View file

@ -979,8 +979,21 @@ main( int argc, char **argv )
/* Okay, we are now working under our real uid */
if( default_config )
configname = make_filename(opt.homedir, "options", NULL );
{
configname = make_filename(opt.homedir, "gpg.conf", NULL );
if (!access (configname, R_OK))
{ /* Print a warning when both config files are present. */
char *p = make_filename(opt.homedir, "options", NULL );
if (!access (p, R_OK))
log_info (_("NOTE: old default options file `%s' ignored\n"), p);
m_free (p);
}
else
{ /* Keep on using the old default one. */
m_free (configname);
configname = make_filename(opt.homedir, "options", NULL );
}
}
argc = orig_argc;
argv = orig_argv;
pargs.argc = &argc;