Ignore:
Timestamp:
Jul 18, 2015, 5:06:52 PM (6 years ago)
Author:
katerina
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/scripts/samhainadmin.pl.in

    r415 r481  
    156156    print "    Set the passphrase for gpg. By default, gpg will ask.\n\n";
    157157
    158     print "  -s secretkeyring --secretkeyring secretkeyring\n";
    159     print "    Select an alternate secret keyring for gpg.\n";
    160     print "    Will use '$ENV{'HOME'}/.gnupg/secring.gpg' by default.\n\n";
     158    print "  -s gnupg_homedir --secretkeyring gnupg_homedir\n";
     159    print "    Select an alternate gpg homedirectory to locate the secret keyring.\n";
     160    print "    Will use '$ENV{'HOME'}/.gnupg/' by default.\n\n";
     161
     162    print "  -k keyid      --keyid keyid\n";
     163    print "   Select the keyid to use for signing.\n\n";
    161164
    162165    print "  -l            --list\n";
     
    570573            'p|passphrase=s',
    571574            's|secretkeyring=s',
     575            'k|keyid=s',
    572576            'create-cfgfile',  # -m F
    573577            'print-cfgfile',   # -m f
     
    584588}
    585589
     590if (defined($opts{'k'})) {
     591    $TARGETKEYID = $opts{'k'};
     592    $KEYTAG = "--default-key";
     593}
    586594if (defined($opts{'c'})) {
    587595    $cfgfile = $opts{'c'};
Note: See TracChangeset for help on using the changeset viewer.