From 8927b55c28eeab38498165bdea162621d7681523 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Fri, 12 Mar 2004 14:29:40 +0000 Subject: [PATCH] 2004-03-12 Marcus Brinkmann * gpgconf-comp.c (gc_component_change_options): Set the filenames of the option's backend, not of the component. --- tools/ChangeLog | 5 +++++ tools/gpgconf-comp.c | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/ChangeLog b/tools/ChangeLog index ebdc94eaf..077115a58 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,8 @@ +2004-03-12 Marcus Brinkmann + + * gpgconf-comp.c (gc_component_change_options): Set the filenames + of the option's backend, not of the component. + 2004-03-09 Werner Koch * gpgconf-comp.c [_riscos_]: Removed special code for RISC OS; we diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 791839a4d..d792d1d75 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -2029,7 +2029,8 @@ gc_component_change_options (int component, FILE *in) { /* Go on if we have already seen this backend, or if there is nothing to do. */ - if (src_pathname[option->backend] || !(option->new_flags || option->new_value)) + if (src_pathname[option->backend] + || !(option->new_flags || option->new_value)) { option++; continue; @@ -2037,14 +2038,14 @@ gc_component_change_options (int component, FILE *in) if (gc_backend[option->backend].program) err = change_options_program (component, option->backend, - &src_pathname[component], - &dest_pathname[component], - &orig_pathname[component]); + &src_pathname[option->backend], + &dest_pathname[option->backend], + &orig_pathname[option->backend]); else err = change_options_file (component, option->backend, - &src_pathname[component], - &dest_pathname[component], - &orig_pathname[component]); + &src_pathname[option->backend], + &dest_pathname[option->backend], + &orig_pathname[option->backend]); if (err) break;