diff options
| author | Werner Koch <[email protected]> | 2010-03-12 18:46:33 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-03-12 18:46:33 +0000 |
| commit | c50f244b200713f3922472da8275bcf5d128f055 (patch) | |
| tree | c98882a7d793f11fb6d45cdea852b2d6a58b5af3 | |
| parent | Add command passwd. (diff) | |
| download | gnupg-c50f244b200713f3922472da8275bcf5d128f055.tar.gz gnupg-c50f244b200713f3922472da8275bcf5d128f055.zip | |
Fix for bug#1201.
| -rw-r--r-- | g10/ChangeLog | 3 | ||||
| -rw-r--r-- | g10/plaintext.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index a6a2f6d43..3f824b122 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,8 @@ 2010-03-12 Werner Koch <[email protected]> + * plaintext.c (setup_plaintext_name): Do not encode pipe like + filenames. This helps with bug#1201. + * seckey-cert.c (do_check): Return GPG_ERR_CANCELED. * keyedit.c (change_passphrase): Add arg R_ERR. (keyedit_passwd): Return the correct error or emit a success diff --git a/g10/plaintext.c b/g10/plaintext.c index 027fe994c..34e18f65f 100644 --- a/g10/plaintext.c +++ b/g10/plaintext.c @@ -623,7 +623,8 @@ setup_plaintext_name(const char *filename,IOBUF iobuf) { PKT_plaintext *pt; - if(filename || opt.set_filename) + if ((filename && !iobuf_is_pipe_filename (filename)) + || (opt.set_filename && !iobuf_is_pipe_filename (opt.set_filename))) { char *s; |