security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00
Code Activity

* tdbio.c (tdbio_set_dbname): Fix assertion failure with

Browse Source 
non-fully-qualified trustdb names.
This commit is contained in:
David Shaw 2003-01-12 15:08:16 +00:00
parent 97e93b7e18
commit d65d805aad
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2003-01-12 David Shaw <dshaw@jabberwocky.com>
* tdbio.c (tdbio_set_dbname): Fix assertion failure with
non-fully-qualified trustdb names.
2003-01-10 David Shaw <dshaw@jabberwocky.com> 2003-01-10 David Shaw <dshaw@jabberwocky.com>
* trustdb.h, trustdb.c (trust_letter): Make static. * trustdb.h, trustdb.c (trust_letter): Make static.

15
g10/tdbio.c
View File

@ -450,9 +450,18 @@ tdbio_set_dbname( const char *new_dbname, int create )
atexit( cleanup ); atexit( cleanup );
initialized = 1; initialized = 1;
} }
fname = new_dbname? m_strdup( new_dbname )
: make_filename(opt.homedir, if(new_dbname==NULL)
"trustdb" EXTSEP_S "gpg", NULL ); fname=make_filename(opt.homedir,"trustdb" EXTSEP_S "gpg", NULL);
else if (*new_dbname != DIRSEP_C )
{
if (strchr(new_dbname, DIRSEP_C) )
fname = make_filename (new_dbname, NULL);
else
fname = make_filename (opt.homedir, new_dbname, NULL);
}
else
fname = m_strdup (new_dbname);
if( access( fname, R_OK ) ) { if( access( fname, R_OK ) ) {
if( errno != ENOENT ) { if( errno != ENOENT ) {