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

* keydb.c (keydb_add_resource): Don't assume that try_make_homedir

Browse Source 
terminates but check again for the existence of the directory and
continue then.
* openfile.c (copy_options_file): Print a warning if the skeleton
file has active options.
This commit is contained in:
Werner Koch 2003-01-02 17:47:35 +00:00
parent 041d99295a
commit e538b99549
3 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/ChangeLog
View File

@ -1,3 +1,11 @@
2003-01-02 Werner Koch <wk@gnupg.org>
* keydb.c (keydb_add_resource): Don't assume that try_make_homedir
terminates but check again for the existence of the directory and
continue then.
* openfile.c (copy_options_file): Print a warning if the skeleton
file has active options.
2002-12-27 David Shaw <dshaw@jabberwocky.com> 2002-12-27 David Shaw <dshaw@jabberwocky.com>
* getkey.c (merge_selfsigs_main), main.h, sig-check.c * getkey.c (merge_selfsigs_main), main.h, sig-check.c

23
g10/keydb.c
View File

@ -159,14 +159,21 @@ keydb_add_resource (const char *url, int force, int secret)
last_slash_in_filename = strrchr (filename, DIRSEP_C); last_slash_in_filename = strrchr (filename, DIRSEP_C);
*last_slash_in_filename = 0; *last_slash_in_filename = 0;
if (access(filename, F_OK)) if (access(filename, F_OK))
{ /* on the first time we try to create the default { /* On the first time we try to create the default
homedir and in this case the process will be homedir and check again. */
terminated, so that on the next invocation it can static int tried;
read the options file in on startup */
try_make_homedir (filename); if (!tried)
rc = G10ERR_OPEN_FILE; {
*last_slash_in_filename = DIRSEP_C; tried = 1;
goto leave; try_make_homedir (filename);
}
if (access (filename, F_OK))
{
rc = G10ERR_OPEN_FILE;
*last_slash_in_filename = DIRSEP_C;
goto leave;
}
} }
*last_slash_in_filename = DIRSEP_C; *last_slash_in_filename = DIRSEP_C;

21
g10/openfile.c
View File

@ -301,6 +301,8 @@ copy_options_file( const char *destdir )
int linefeeds=0; int linefeeds=0;
int c; int c;
mode_t oldmask; mode_t oldmask;
int esc = 0;
int any_option = 0;
if( opt.dry_run ) if( opt.dry_run )
return; return;
@ -329,12 +331,27 @@ copy_options_file( const char *destdir )
if( c == '\n' ) if( c == '\n' )
linefeeds++; linefeeds++;
} }
else else {
putc( c, dst ); putc( c, dst );
if (c== '\n')
esc = 1;
else if (esc == 1) {
if (c == ' ' || c == '\t')
;
else if (c == '#')
esc = 2;
else
any_option = 1;
}
}
} }
fclose( dst ); fclose( dst );
fclose( src ); fclose( src );
log_info(_("new configuration file `%s' created\n"), fname ); log_info(_("new configuration file `%s' created\n"), fname );
if (any_option)
log_info (_("WARNING: options in `%s'"
" are not yet active during this run\n"),
fname);
m_free(fname); m_free(fname);
} }
@ -371,3 +388,5 @@ try_make_homedir( const char *fname )
/* g10_exit(1); */ /* g10_exit(1); */
} }
} }