Module Name: src
Committed By: agc
Date: Tue Dec 22 06:51:31 UTC 2009
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.c
Log Message:
Fix error in merge of previous change shown up by regression tests.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.9 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.10
--- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c:1.9 Tue Dec 22 06:03:25 2009
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.c Tue Dec 22 06:51:31 2009
@@ -220,7 +220,6 @@
{
int cc;
int n;
- int i;
if (size <= 0) {
(void) fprintf(stderr, "%s\n", header);
@@ -311,7 +310,10 @@
free(out);
return ret;
}
- return netpgp_verify_file(netpgp, f, NULL, p->armour);
+ return netpgp_verify_file(netpgp, f,
+ (p->cmd == VERIFY) ? NULL :
+ (p->output) ? p->output : "-",
+ p->armour);
case LIST_PACKETS:
return nonnull(f, p->progname) &&
netpgp_list_packets(netpgp, f, p->armour, NULL);
