From 45accef52a9e703bd204087abc2dc0a4e15d57ac Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 31 Aug 2004 09:00:58 +0000 Subject: [PATCH] Better take the length of SKELEXT into account --- g10/ChangeLog | 3 ++- g10/openfile.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 429ab368d..498d247b9 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,6 +1,7 @@ 2004-08-31 Werner Koch - * openfile.c (copy_options_file): Use gpg-conf.skel + * openfile.c (copy_options_file): Use gpg-conf.skel. Better take + the length of SKELEXT into account, someone might make it larger. * Makefile.am: Install options.skel as gpg-conf.skel. 2004-08-18 Marcus Brinkmann diff --git a/g10/openfile.c b/g10/openfile.c index 663c2c5d3..dbf42db78 100644 --- a/g10/openfile.c +++ b/g10/openfile.c @@ -308,7 +308,8 @@ copy_options_file( const char *destdir ) if( opt.dry_run ) return; - fname = xmalloc ( strlen(datadir) + strlen(destdir) + 15 ); + fname = xmalloc ( strlen(datadir) + strlen(destdir) + strlen (SKELEXT) + 15 ); strcpy(stpcpy(fname, datadir), DIRSEP_S "gpg-conf" SKELEXT ); src = fopen( fname, "r" ); if( !src ) {