Changeset 1254

Timestamp:

09/28/08 20:17:20 (2 months ago)

Author:

mbr

Message:

Added GPG_PATH variable to access.conf import routine to allow different paths for gpg to be specified on a per-SOURCE basis

Files:

• fwknop/trunk/fwknopd (modified) (4 diffs)

fwknop/trunk/fwknopd

@@ -231 +231 @@
-    'GPG_NO_REQUIRE_PREFIX' => 0,
-    'GPG_PREFIX' => '',
+    'GPG_PATH'   => '',
-    'ULOG_PCAP'  => '',
-    'FILE_PCAP'  => '',
@@ -2335 +2336 @@
-        if $gpg_no_options or $access_hr->{'GPG_NO_OPTIONS'};
-
-
+
+
+
+
+
-
-    my $input  = IO::Handle->new() or die $!;
@@ -3526 +3531 @@
-                } elsif ($line =~ /^\s*GPG_PREFIX:\s*(\S+);/) {
-                    $access_hsh{'GPG_PREFIX'} = $1;
+                } elsif ($line =~ /^\s*GPG_PATH:\s*(\S+);/) {
+                    $access_hsh{'GPG_PATH'} = $1;
+                    unless (-e $access_hsh{'GPG_PATH'}
+                            and -x $access_hsh{'GPG_PATH'}) {
+                        die "[*] $access_hsh{'GPG_PATH'} does not exist ",
+                            "or could not execute.";
+                    }
-                } elsif ($line =~ /^\s*FILE_PCAP\s*;/) {
-                    ### used in file pcap mode
@@ -3904 +3916 @@
-            $access_hr->{'GPG_PREFIX'} = $gpg_default_prefix
-                unless defined $access_hr->{'GPG_PREFIX'};
+            $access_hr->{'GPG_PATH'} = ''
+                unless defined $access_hr->{'GPG_PATH'};
-        }
-        if (defined ($access_hr->{'REQUIRE_AUTH_METHOD'})) {