Changeset 481 for trunk/scripts/samhainadmin.pl.in

Timestamp:

Jul 18, 2015, 5:06:52 PM (9 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

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

trunk/scripts/samhainadmin.pl.in

@@ -156 +156 @@
     print "    Set the passphrase for gpg. By default, gpg will ask.\n\n";
 
-    print "  -s secretkeyring --secretkeyring secretkeyring\n";
-    print "    Select an alternate secret keyring for gpg.\n";
-    print "    Will use '$ENV{'HOME'}/.gnupg/secring.gpg' by default.\n\n";
+    print "  -s gnupg_homedir --secretkeyring gnupg_homedir\n";
+    print "    Select an alternate gpg homedirectory to locate the secret keyring.\n";
+    print "    Will use '$ENV{'HOME'}/.gnupg/' by default.\n\n";
+
+    print "  -k keyid      --keyid keyid\n";
+    print "   Select the keyid to use for signing.\n\n";
 
     print "  -l            --list\n";
@@ -570 +573 @@
             'p|passphrase=s',
             's|secretkeyring=s',
+            'k|keyid=s',
             'create-cfgfile',  # -m F
             'print-cfgfile',   # -m f
@@ -584 +588 @@
 }
 
+if (defined($opts{'k'})) {
+    $TARGETKEYID = $opts{'k'};
+    $KEYTAG = "--default-key";
+}
 if (defined($opts{'c'})) {
     $cfgfile = $opts{'c'};