gnupg/g10 (ChangeLog sign.c)

[cvs user dshaw]

    Date: Friday, May 6, 2005 @ 15:03:22
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog sign.c

* sign.c (sign_file, clearsign_file, sign_symencrypt_file): Use the
default sig expire value when signing in batchmode.


-----------+
 ChangeLog |    5 +++++
 sign.c    |   12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.731 gnupg/g10/ChangeLog:1.732
--- gnupg/g10/ChangeLog:1.731	Fri May  6 00:32:52 2005
+++ gnupg/g10/ChangeLog	Fri May  6 15:03:22 2005
@@ -1,3 +1,8 @@
+2005-05-06  David Shaw  <dshaw at jabberwocky.com>
+
+	* sign.c (sign_file, clearsign_file, sign_symencrypt_file): Use
+	the default sig expire value when signing in batchmode.
+
 2005-05-05  David Shaw  <dshaw at jabberwocky.com>
 
 	* Makefile.am, packet.h, main.h, comment.c: Remove comment.c.  We
Index: gnupg/g10/sign.c
diff -u gnupg/g10/sign.c:1.138 gnupg/g10/sign.c:1.139
--- gnupg/g10/sign.c:1.138	Thu May  5 21:21:40 2005
+++ gnupg/g10/sign.c	Fri May  6 15:03:22 2005
@@ -744,9 +744,9 @@
        && (rc=setup_symkey(&efx.symkey_s2k,&efx.symkey_dek)))
       goto leave;
 
-    if(!opt.force_v3_sigs && !opt.batch && !RFC1991)
+    if(!opt.force_v3_sigs && !RFC1991)
       {
-	if(opt.ask_sig_expire)
+	if(opt.ask_sig_expire && !opt.batch)
 	  duration=ask_expire_interval(1,opt.def_sig_expire);
 	else
 	  duration=parse_expire_string(opt.def_sig_expire)*86400L;
@@ -1014,9 +1014,9 @@
     memset( &afx, 0, sizeof afx);
     init_packet( &pkt );
 
-    if(!opt.force_v3_sigs && !opt.batch && !RFC1991)
+    if(!opt.force_v3_sigs && !RFC1991)
       {
-	if(opt.ask_sig_expire)
+	if(opt.ask_sig_expire && !opt.batch)
 	  duration=ask_expire_interval(1,opt.def_sig_expire);
 	else
 	  duration=parse_expire_string(opt.def_sig_expire)*86400L;
@@ -1173,9 +1173,9 @@
     memset( &cfx, 0, sizeof cfx);
     init_packet( &pkt );
 
-    if(!opt.force_v3_sigs && !opt.batch && !RFC1991)
+    if(!opt.force_v3_sigs && !RFC1991)
       {
-	if(opt.ask_sig_expire)
+	if(opt.ask_sig_expire && !opt.batch)
 	  duration=ask_expire_interval(1,opt.def_sig_expire);
 	else
 	  duration=parse_expire_string(opt.def_sig_expire)*86400L;