mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-03 12:11:33 +01:00
W32 fix for trustdb creation.
This commit is contained in:
parent
843d6c69ef
commit
b680d034fa
@ -1,3 +1,9 @@
|
||||
2008-01-29 Justin Pryzby <jpryzby+d@quoininc.com> (wk)
|
||||
|
||||
* gpg-agent.texi (Agent Options): Grammar fixes
|
||||
|
||||
* qualified.txt: Spelling fixes.
|
||||
|
||||
2008-01-28 Justin Pryzby <jpryzby+d@quoininc.com> (wk)
|
||||
|
||||
* gpg-agent.texi, yat2m.c, scdaemon.texi, qualified.txt
|
||||
@ -559,7 +565,7 @@
|
||||
|
||||
* Makefile.am, gpgsm.texi: New.
|
||||
|
||||
Copyright 2002, 2004, 2005 Free Software Foundation, Inc.
|
||||
Copyright 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
|
||||
This file is free software; as a special exception the author gives
|
||||
unlimited permission to copy and/or distribute it, with or without
|
||||
|
@ -319,8 +319,8 @@ more arguments in future versions.
|
||||
indicate how trustworthy the signature is. The error token
|
||||
values are currently only emitted by gpgsm. VALIDATION_MODEL
|
||||
describes the algorithm used to check the validity of the key.
|
||||
The default is the standard gpg Web of Trust model respective
|
||||
the standard X.509 model. The defined values are
|
||||
The defaults are the standard Web of Trust model for gpg and the
|
||||
the standard X.509 model for gpgsm. The defined values are
|
||||
|
||||
"pgp" for the standard PGP WoT.
|
||||
"shell" for the standard X.509 model.
|
||||
|
@ -268,9 +268,9 @@ debugging.
|
||||
@opindex c
|
||||
@opindex csh
|
||||
Format the info output in daemon mode for use with the standard Bourne
|
||||
shell respective the C-shell. The default is to guess it based on the
|
||||
environment variable @code{SHELL} which is in almost all cases
|
||||
correct.
|
||||
shell or the C-shell respectively. The default is to guess it based on
|
||||
the environment variable @code{SHELL} which is correct in almost all
|
||||
cases.
|
||||
|
||||
@item --write-env-file @var{file}
|
||||
@opindex write-env-file
|
||||
@ -436,8 +436,8 @@ information.
|
||||
@itemx --keep-display
|
||||
@opindex keep-tty
|
||||
@opindex keep-display
|
||||
Ignore requests to change the current @code{tty} respective the X
|
||||
window system's @code{DISPLAY} variable. This is useful to lock the
|
||||
Ignore requests to change the current @code{tty} or X window system's
|
||||
@code{DISPLAY} variable respectively. This is useful to lock the
|
||||
pinentry to pop up at the @code{tty} or display you started the agent.
|
||||
|
||||
@anchor{option --enable-ssh-support}
|
||||
|
@ -1,3 +1,7 @@
|
||||
2008-01-30 Werner Koch <wk@g10code.com>
|
||||
|
||||
* tdbio.c (tdbio_set_dbname): Also test for forward slash.
|
||||
|
||||
2008-01-29 Werner Koch <wk@g10code.com>
|
||||
|
||||
* keydb.c (maybe_create_keyring): Take care of a missing slash.
|
||||
|
13
g10/tdbio.c
13
g10/tdbio.c
@ -505,14 +505,25 @@ tdbio_set_dbname( const char *new_dbname, int create )
|
||||
int rc;
|
||||
char *p = strrchr( fname, DIRSEP_C );
|
||||
mode_t oldmask;
|
||||
int save_slash;
|
||||
|
||||
#if HAVE_W32_SYSTEM
|
||||
{
|
||||
/* Windows may either have a slash or a backslash. Take
|
||||
care of it. */
|
||||
char *pp = strrchr (fname, '/');
|
||||
if (!p || pp > p)
|
||||
p = pp;
|
||||
}
|
||||
#endif /*HAVE_W32_SYSTEM*/
|
||||
assert (p);
|
||||
save_slash = *p;
|
||||
*p = 0;
|
||||
if( access( fname, F_OK ) ) {
|
||||
try_make_homedir( fname );
|
||||
log_fatal( _("%s: directory does not exist!\n"), fname );
|
||||
}
|
||||
*p = DIRSEP_C;
|
||||
*p = save_slash;
|
||||
|
||||
xfree(db_name);
|
||||
db_name = fname;
|
||||
|
Loading…
x
Reference in New Issue
Block a user