Changeset 1124

Timestamp:

06/07/08 13:08:24 (6 months ago)

Author:

mbr

Message:

minor --locale and copyright date updates

Files:

• fwknop/trunk/fwknop (modified) (3 diffs)
• fwknop/trunk/fwknop.h (modified) (1 diff)
• fwknop/trunk/fwknop_serv (modified) (1 diff)
• fwknop/trunk/fwknopd (modified) (4 diffs)
• fwknop/trunk/install.pl (modified) (1 diff)
• fwknop/trunk/knopmd.c (modified) (1 diff)
• fwknop/trunk/knoptm (modified) (6 diffs)
• fwknop/trunk/knopwatchd.c (modified) (1 diff)

fwknop/trunk/fwknop

@@ -19 +19 @@
-# Version: 1.9.5-pre1
-#
-7
+8
-#
-# License (GNU Public License):
@@ -1748 +1748 @@
-    -D, --Destination <IP>     - The IP address of the fwknopd server (the
-                                 IP want to connect to).
-l, --last-cmd
+-last-cmd    
-                                 arguments as in the previous invocation.
-                                 The args are stored in ~/fwknop.run.
@@ -1868 +1868 @@
-                                 knock sequence (synonym for -D).
-    -d, --debug                - Run fwknop in debugging mode.
+    --locale <locale>          - Manually define a locale setting.
+    --no-locale                - Don't set the locale to anything (the
+                                 default is the "C" locale).
-    -v, --verbose              - Verbose mode.
-    -V, --Version              - Display version and exit.

fwknop/trunk/fwknop.h

@@ -12 +12 @@
-*  Version: 1.8
-*
-7
+8
-*
-*  License (GNU Public License):

fwknop/trunk/fwknop_serv

@@ -18 +18 @@
-# Version: 1.9.5-pre1
-#
-7
+8
-#
-# License (GNU Public License):

fwknop/trunk/fwknopd

@@ -22 +22 @@
-# Version: 1.9.5-pre1
-#
-7
+8
-#
-# License (GNU Public License):
@@ -3667 +3667 @@
-    ### make Getopts case sensitive
-    Getopt::Long::Configure('no_ignore_case');
--
+*
-        'config=s'       => \$config_file,
-        'access-conf=s'  => \$access_conf_file,
@@ -4041 +4041 @@
-        $cmd .= ' --no-logs' if $test_mode;
-        $cmd .= " --fw-type $config{'FIREWALL_TYPE'}" if $fw_type;
+        $cmd .= " --locale $cmdline_locale" if $cmdline_locale;
-
-        ### always start knoptm
@@ -4884 +4885 @@
-                                 have the pcap_datali.al file.
-    -d, --debug                - Run fwknopd in debugging mode.
+    --locale <locale>          - Manually define a locale setting.
+    --no-locale                - Don't set the locale to anything (the
+                                 default is the "C" locale from the LOCALE
+                                 variable in the fwknop.conf file).
-    -v, --verbose              - Verbose mode.
-    -V, --Version              - Display version and exit.

fwknop/trunk/install.pl

@@ -11 +11 @@
-# Credits:  (see the CREDITS file)
-#
-7
+8
-#
-# License (GNU Public License):

fwknop/trunk/knopmd.c

@@ -13 +13 @@
-*  Version: 1.8
-*
-7
+8
-*
-*  License (GNU Public License):

fwknop/trunk/knoptm

@@ -21 +21 @@
-# Version: 1.9.5-pre1
-#
-7
+8
-#
-# License (GNU Public License):
@@ -80 +80 @@
-my $zero_ip_re = qr|(?:0\.){3}0|;
-
-locale = 'C';  ### default LC_ALL env variable
+cmdline_locale = '';
-my $no_locale = 0;
-
@@ -95 +95 @@
-    'no-voluntary-exits' => \$no_voluntary_exits,
-    'no-logs'   => \$no_logs,
-     => \$
-     => \$
-     
-     
+=> \$cmdline_
+=> \$cmdline_
+
+
-    'help'      => \$print_help
-));
@@ -112 +112 @@
-&usage(0) if $print_help;
-
-### set LC_ALL env variable
-$ENV{'LC_ALL'} = $locale unless $no_locale;
-
-### set things up, deal with pid's, and import config
-&knoptm_init();
+
+&handle_locale();
-
-print STDERR "[+] Opening $config{'KNOPTM_IP_TIMEOUT_SOCK'} socket, ",
@@ -744 +743 @@
-            ALERTING_METHODS FIREWALL_TYPE KNOPTM_SYSLOG_IDENTITY
-            KNOPTM_SYSLOG_FACILITY KNOPTM_SYSLOG_PRIORITY
-
+
+
+
-
-        die "[*] Variable $var is not defined in $config_file"
@@ -832 +833 @@
-    close D;
-    $warn_msg = '';
+    return;
+}
+
+sub handle_locale() {
+    $config{'LOCALE'} = $cmdline_locale if $cmdline_locale;
+
+    if ($config{'LOCALE'} ne 'NONE' and not $no_locale) {
+        ### set LC_ALL env variable
+        $ENV{'LC_ALL'} = $config{'LOCALE'};
+    }
-    return;
-}

fwknop/trunk/knopwatchd.c

@@ -16 +16 @@
-*  Version: 1.9.5-pre1
-*
-7
+8
-*
-*  License (GNU Public License):