Changeset 191 for trunk/scripts

Timestamp:

Nov 7, 2008, 10:01:47 PM (16 years ago)

Author:

katerina

Message:

Patch for GnuPG key ID by Jim Dutton

File:

• trunk/scripts/samhainadmin.pl.in (modified) (2 diffs)

trunk/scripts/samhainadmin.pl.in

@@ -50 +50 @@
 my $daemon   = "@sbindir@/@install_name@";
 my $gpg      = "@mygpg@";
+
+my $TARGETKEYID = "@mykeyid@";
+my $KEYTAG      = "@mykeytag@";
 
 $cfgfile  =~ s/^REQ_FROM_SERVER//;
@@ -502 +505 @@
     if (defined($passphrase)) {
         local $SIG{PIPE} = 'IGNORE';
-        my $command = "$gpg --homedir $ENV{'HOME'}/.gnupg --passphrase-fd 0 -a --clearsign -o $fileout --not-dash-escaped $file1";
+        my $command = "$gpg --homedir $ENV{'HOME'}/.gnupg --passphrase-fd 0 -a ${KEYTAG} ${TARGETKEYID} --clearsign -o $fileout --not-dash-escaped $file1";
         open (FH, "|$command")  or die "can't fork: $!";
         print FH "$passphrase"  or die "can't write: $!";
         close FH                or die "can't close: status=$?";
     } else {
-        my $command = "$gpg --homedir $ENV{'HOME'}/.gnupg                   -a --clearsign -o $fileout --not-dash-escaped $file1";
+        my $command = "$gpg --homedir $ENV{'HOME'}/.gnupg                   -a ${KEYTAG} ${TARGETKEYID} --clearsign -o $fileout --not-dash-escaped $file1";
         system("$command") == 0 
             or die "system $command failed: $?";