security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

* openfile.c (copy_options_file): Use gpg-conf.skel

Browse Source 
* Makefile.am: Install options.skel as gpg-conf.skel.
This commit is contained in:
Werner Koch 2004-08-31 07:57:33 +00:00
parent 2a09a35ad0
commit 452e415784
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2004-08-31 Werner Koch <wk@g10code.de>
* openfile.c (copy_options_file): Use gpg-conf.skel
* Makefile.am: Install options.skel as gpg-conf.skel.
2004-08-18 Marcus Brinkmann <marcus@g10code.de> 2004-08-18 Marcus Brinkmann <marcus@g10code.de>
* passphrase.c (agent_get_passphrase): Fix detection of gpg-agent * passphrase.c (agent_get_passphrase): Fix detection of gpg-agent

2
g10/Makefile.am
View File

@ -117,5 +117,5 @@ $(PROGRAMS): $(needed_libs)
install-data-local: install-data-local:
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) $(srcdir)/options.skel \ $(INSTALL_DATA) $(srcdir)/options.skel \
$(DESTDIR)$(pkgdatadir)/options.skel $(DESTDIR)$(pkgdatadir)/gpg-conf.skel

2
g10/openfile.c
View File

@ -309,7 +309,7 @@ copy_options_file( const char *destdir )
return; return;
fname = xmalloc ( strlen(datadir) + strlen(destdir) + 15 ); fname = xmalloc ( strlen(datadir) + strlen(destdir) + 15 );
strcpy(stpcpy(fname, datadir), DIRSEP_S "options" SKELEXT ); strcpy(stpcpy(fname, datadir), DIRSEP_S "gpg-conf" SKELEXT );
src = fopen( fname, "r" ); src = fopen( fname, "r" );
if( !src ) { if( !src ) {
log_error(_("%s: can't open: %s\n"), fname, strerror(errno) ); log_error(_("%s: can't open: %s\n"), fname, strerror(errno) );