security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-23 15:07:03 +01:00
Code Activity

Do not print read-only trustdb warning with --quiet.

Browse Source 
This is only a warning and gpg would anyway print an error message if
it tries to write to the trustdb.
This commit is contained in:
Werner Koch 2011-07-29 10:00:15 +02:00
parent ab0d29fdf0
commit dea8ad4535
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/ChangeLog
View File

@ -1,3 +1,7 @@
2011-07-29 Werner Koch <wk@g10code.com>
* tdbio.c (open_db): Do not print read-only warning in quiet mode.
2011-07-22 Werner Koch <wk@g10code.com> 2011-07-22 Werner Koch <wk@g10code.com>
* parse-packet.c (parse_key): Print the decoded iteration count. * parse-packet.c (parse_key): Print the decoded iteration count.

8
g10/tdbio.c
View File

@ -449,7 +449,7 @@ create_version_record (void)
{ {
TRUSTREC rec; TRUSTREC rec;
int rc; int rc;
memset( &rec, 0, sizeof rec ); memset( &rec, 0, sizeof rec );
rec.r.ver.version = 3; rec.r.ver.version = 3;
rec.r.ver.created = make_timestamp(); rec.r.ver.created = make_timestamp();
@ -609,7 +609,7 @@ open_db()
) )
) { ) {
db_fd = open (db_name, O_RDONLY | MY_O_BINARY ); db_fd = open (db_name, O_RDONLY | MY_O_BINARY );
if (db_fd != -1) if (db_fd != -1 && !opt.quiet)
log_info (_("NOTE: trustdb not writable\n")); log_info (_("NOTE: trustdb not writable\n"));
} }
if ( db_fd == -1 ) if ( db_fd == -1 )
@ -692,7 +692,7 @@ tdbio_read_model(void)
{ {
TRUSTREC vr; TRUSTREC vr;
int rc; int rc;
rc = tdbio_read_record( 0, &vr, RECTYPE_VER ); rc = tdbio_read_record( 0, &vr, RECTYPE_VER );
if( rc ) if( rc )
log_fatal( _("%s: error reading version record: %s\n"), log_fatal( _("%s: error reading version record: %s\n"),
@ -1010,7 +1010,7 @@ drop_from_hashtable( ulong table, byte *key, int keylen, ulong recnum )
*/ */
static int static int
lookup_hashtable( ulong table, const byte *key, size_t keylen, lookup_hashtable( ulong table, const byte *key, size_t keylen,
int (*cmpfnc)(const void*, const TRUSTREC *), int (*cmpfnc)(const void*, const TRUSTREC *),
const void *cmpdata, TRUSTREC *rec ) const void *cmpdata, TRUSTREC *rec )
{ {
int rc; int rc;