Changeset 2208

Timestamp:

08/04/08 08:04:04 (4 months ago)

Author:

mbr

Message:

updated to allow the /usr/bin/whois path to override a non-existant /usr/bin/whois_psad path (i.e. the normal system whois client will be used

Files:

• psad/trunk/psad (modified) (3 diffs)

psad/trunk/psad

@@ -604 +604 @@
-&get_local_ips();
-
-### disable whois lookups if for some reason the whois client that is
-### bundled with psad can't be found
-unless ($no_whois) {
-    unless (defined $cmds{'whois'}
-            and -x $cmds{'whois'}) {  ### we couldn't find whois_psad
-        warn '[-] Could not locate whois_psad binary.  ',
-            "Disabling whois lookups.\n";
-        $no_whois = 1;
-    }
-}
-
-### daemonize psad unless running with --no-daemon or an
-### analysis mode
@@ -9521 +9510 @@
-sub check_commands() {
-    my $exceptions_hr = shift;
+
+    if ($no_whois) {
+        $exceptions_hr->{'whois'} = '';
+    } else {
+        unless (defined $cmds{'whois'}
+                and -x $cmds{'whois'}) {
+            ### try setting to normal /usr/bin/whois path, and let
+            ### the code below work out the correct path if necessary
+            $cmds{'whois'} = '/usr/bin/whois';
+        }
+    }
+
-    my @path = qw(
-        /bin
@@ -9564 +9565 @@
-        }
-    }
+
+    unless ($no_whois) {
+        ### disable whois lookups if a suitable whois client could not
+        ### be found.
+        unless (defined $cmds{'whois'}
+                and -x $cmds{'whois'}) {  ### we couldn't find whois_psad
+            warn '[-] Could not locate whois binary, ',
+                "disabling whois lookups.\n";
+            $no_whois = 1;
+        }
+    }
+
-    return;
-}