Imported Upstream version 3.3.3

[debian/amanda] / common-src / amcryptsimple.pl

diff --git a/common-src/amcryptsimple.pl b/common-src/amcryptsimple.pl
index dd8760f91d0e0461dbce95e305c0224706201f03..f21db2bbe6b1cbe7e9bdaeabefccd45062384caa 100755 (executable)
--- a/common-src/amcryptsimple.pl
+++ b/common-src/amcryptsimple.pl
@@ -2,9 +2,10 @@
 #
 # Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -77,7 +78,7 @@ sub which_gpg() {
 sub encrypt() {
     my $gpg_agent_cmd = do_gpg_agent();
     my $gpg = which_gpg();
-    system "$gpg_agent_cmd $gpg --batch --no-secmem-warning --disable-mdc --symmetric --cipher-algo AES256 --passphrase-fd 3  3<$AM_PASS";
+    system "$gpg_agent_cmd $gpg --batch -z 0 --no-secmem-warning --disable-mdc --symmetric --cipher-algo AES256 --passphrase-fd 3  3<$AM_PASS";
     if ($? == -1) {
        print STDERR "failed to execute gpg: $!\n";
        exit (1);