From 1bc01dd8f6ce74a8a2f318baaa4818a6a95ce0e9 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sat, 24 Oct 2015 15:27:01 -0400 Subject: [PATCH] Fix resetting key files for non-interactive mode. After OPEN, the --key-file, --new-key-file and --sign-key-file options were getting reset. --- src/pwmc.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/pwmc.c b/src/pwmc.c index 6ffe892e..63d5b1ae 100644 --- a/src/pwmc.c +++ b/src/pwmc.c @@ -1089,7 +1089,9 @@ open_command (const char *line) if (!rc) rc = pwmd_open (pwm, filename, inquire_cb, inq); - reset_keyfiles (); + if (interactive) + reset_keyfiles (); + free_inquire (inq); return rc; } @@ -1245,7 +1247,9 @@ save_command (const char *line) if (!rc) rc = pwmd_save (pwm, line, inquire_cb, inq); - reset_keyfiles (); + if (interactive) + reset_keyfiles (); + free_inquire (inq); return rc; } @@ -1285,7 +1289,9 @@ do_save_passwd_command (const char *line, int save) rc = pwmd_passwd (pwm, line, inquire_cb, inq); } - reset_keyfiles (); + if (interactive) + reset_keyfiles (); + free_inquire (inq); return rc; } -- 2.11.4.GIT