diff options
| author | Werner Koch <wk@gnupg.org> | 1998-03-09 22:44:06 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 1998-03-09 22:44:06 +0100 |
| commit | a6a8f1e706bd7e528262151bc04ebb9409c2eeed (patch) | |
| tree | 20b5771581e695a22559d8ffe3f90862afb11e3d /g10/trustdb.c | |
| parent | removed g10maint.c (diff) | |
| download | gnupg2-a6a8f1e706bd7e528262151bc04ebb9409c2eeed.tar.xz gnupg2-a6a8f1e706bd7e528262151bc04ebb9409c2eeed.zip | |
partial DSA support
Diffstat (limited to 'g10/trustdb.c')
| -rw-r--r-- | g10/trustdb.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/g10/trustdb.c b/g10/trustdb.c index 8c9088b91..257c37204 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -912,7 +912,7 @@ print_user_id( const char *text, u32 *keyid ) putchar(' '); } putchar('\"'); - print_string( stdout, p, n ); + print_string( stdout, p, n, 0 ); putchar('\"'); putchar('\n'); m_free(p); @@ -1520,13 +1520,18 @@ init_trustdb( int level, const char *dbname ) assert(p); *p = 0; if( access( fname, F_OK ) ) { - #if __MINGW32__ - if( mkdir( fname ) ) - #else - if( mkdir( fname, S_IRUSR|S_IWUSR|S_IXUSR ) ) - #endif - log_fatal("can't create directory '%s': %s\n", - fname, strerror(errno) ); + if( strlen(fname) >= 7 + && !strcmp(fname+strlen(fname)-7, "/.gnupg" ) ) { + #if __MINGW32__ + if( mkdir( fname ) ) + #else + if( mkdir( fname, S_IRUSR|S_IWUSR|S_IXUSR ) ) + #endif + log_fatal("can't create directory '%s': %s\n", + fname, strerror(errno) ); + } + else + log_fatal("directory '%s' does not exist!\n", fname ); } *p = '/'; create_db( fname ); @@ -1539,7 +1544,7 @@ init_trustdb( int level, const char *dbname ) return 0; /* we can verify a signature about our local data (secring and trustdb) - * in ~/.g10/ here */ + * in ~/.gnupg/ here */ rc = verify_private_data(); if( !rc ) { /* verify, that our own certificates are in the trustDB |