diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2015-09-06 10:02:20 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2015-09-06 10:02:20 -0600 |
| commit | 8ca41ab99d2ebe7244e8da672e8bd5764d18639c (patch) | |
| tree | deff402aa65a733f54c74af2ea3f12dc02095626 | |
| parent | a433ae52981e7eb9dc5a90a3afc25f53bc782032 (diff) | |
| download | alpine-8ca41ab99d2ebe7244e8da672e8bd5764d18639c.tar.xz | |
* S/MIME: transferring certificates failed to remove temporary files.
| -rw-r--r-- | pith/pine.hlp | 5 | ||||
| -rw-r--r-- | pith/smime.c | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/pith/pine.hlp b/pith/pine.hlp index 9e9bcc2c..f35659a3 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 92 2015-09-05 14:35:38 +Alpine Commit 93 2015-09-06 10:02:16 ============= h_news ================= <HTML> <HEAD> @@ -268,7 +268,8 @@ Bugs that have been addressed include: <LI> SMIME: Cancelling entering password to unlock key will not reprompt. <LI> S/MIME: fix a bug that did not allow users to transfer certificates to - remote containers. Reported by Matthias Rieber. + remote containers. Reported by Matthias Rieber. Also, remove any + temporary files created during this transfer. <LI> Pico: Searching for a string that is too long causes Pico to crash in the next search. diff --git a/pith/smime.c b/pith/smime.c index 40e8d671..a4e401eb 100644 --- a/pith/smime.c +++ b/pith/smime.c @@ -1691,8 +1691,16 @@ copy_dir_to_container(WhichCerts which, char *contents) } /* if(!ret) */ } - if(tempfile) + if(tempfile){ + if(ret == 0){ + if(our_unlink(tempfile) < 0) + q_status_message1(SM_ORDER, 3, 3, + _("Error removing temporary file %s"), tempfile); + } else + q_status_message1(SM_ORDER, 3, 3, + _("Data saved to temporary file %s"), tempfile); fs_give((void **) &tempfile); + } if(ret_dir) fs_give((void **) &ret_dir); |