diff options
Diffstat (limited to 'security/sguil/files/patch-server__sguild')
| -rw-r--r-- | security/sguil/files/patch-server__sguild | 101 |
1 files changed, 0 insertions, 101 deletions
diff --git a/security/sguil/files/patch-server__sguild b/security/sguil/files/patch-server__sguild deleted file mode 100644 index d92097818c9a..000000000000 --- a/security/sguil/files/patch-server__sguild +++ /dev/null @@ -1,101 +0,0 @@ ---- server/sguild.orig 2018-03-31 21:41:21 UTC -+++ server/sguild -@@ -1,6 +1,4 @@ - #!/bin/sh --# Run tcl from users PATH \ --exec tclsh "$0" "$@" - - # $Id: sguild,v 1.194 2013/09/05 00:38:45 bamm Exp $ # - -@@ -35,13 +33,13 @@ proc DisplayUsage { cmdName } { - puts " -D Runs sguild in daemon mode" - puts " -d <0|1|2>: Set DEBUG level" - puts " -P <filename>: PATH to write PID file (def: /var/run/sguild.pid)" -- puts " -c <filename>: PATH to sguild config file (def: /etc/sguild/sguild.conf or .)" -- puts " -a <filename>: PATH to autocat config file (def: /etc/sguild/autocat.conf)" -- puts " -g <filename>: PATH to global queries file (def: /etc/sguild/sguild.queries)" -- puts " -A <filename>: PATH to user access file (def: /etc/sguild/sguild.access)" -+ puts " -c <filename>: PATH to sguild config file (def: /usr/local/etc/sguild/sguild.conf or .)" -+ puts " -a <filename>: PATH to autocat config file (def: /usr/local/etc/sguild/autocat.conf)" -+ puts " -g <filename>: PATH to global queries file (def: /usr/local/etc/sguild/sguild.queries)" -+ puts " -A <filename>: PATH to user access file (def: /usr/local/etc/sguild/sguild.access)" - puts " -l <filepath>: PATH to sguild libraries (def: ./lib)" - puts " -O <filepath>: PATH to tls library, libtls1.*.so (def: \$LIBPATH)" -- puts " -C <directory>: Directory with certificate files chain.pem, cert.pem, and privkey.pem files (def: /etc/sguild/certs)" -+ puts " -C <directory>: Directory with certificate files chain.pem, cert.pem, and privkey.pem files (def: /usr/local/etc/sguild/certs)" - puts " -L <directory>: Directory to write logfiles (def: /var/log/sguild)" - puts " -U <userid>: User id to write logfiles" - puts " -G <groupid>: Group id to write logfiles" -@@ -232,7 +230,7 @@ foreach arg $argv { - ################################## - - # Do all priv account actions here. --# Open log files/etc. Privs will be dropped after. -+# Open log files/usr/local/etc. Privs will be dropped after. - - if { ![info exists LOG_PATH] } { set LOG_PATH /var/log/sguild } - -@@ -310,8 +308,8 @@ if { [info exists GROUP] } { - - if { ![info exists CONF_FILE] } { - # No conf file specified check the defaults -- if { [file exists /etc/sguild/sguild.conf] } { -- set CONF_FILE /etc/sguild/sguild.conf -+ if { [file exists /usr/local/etc/sguild/sguild.conf] } { -+ set CONF_FILE /usr/local/etc/sguild/sguild.conf - } elseif { [file exists ./sguild.conf] } { - set CONF_FILE ./sguild.conf - } else { -@@ -452,7 +450,7 @@ if { [catch {package require tls} tlsError] } { - # Check for certs - if {![info exists CERTS_PATH]} { - -- set CERTS_PATH /etc/sguild/certs -+ set CERTS_PATH /usr/local/etc/sguild/certs - - } - -@@ -508,8 +506,8 @@ if { [info exists DISABLEUSER] && $DISABLEUSER} { - # Load accessfile - if { ![info exists ACCESS_FILE] } { - # Check the defaults -- if { [file exists /etc/sguild/sguild.access] } { -- set ACCESS_FILE "/etc/sguild/sguild.access" -+ if { [file exists /usr/local/etc/sguild/sguild.access] } { -+ set ACCESS_FILE "/usr/local/etc/sguild/sguild.access" - } elseif { [file exists ./sguild.access] } { - set ACCESS_FILE "./sguild.access" - } else { -@@ -535,8 +533,8 @@ if { [file exists $ACCESS_FILE] } { - #} - # Load email config file - if { ![info exists EMAIL_FILE] } { -- if { [file exists /etc/sguild/sguild.email] } { -- set EMAIL_FILE "/etc/sguild/sguild.email" -+ if { [file exists /usr/local/etc/sguild/sguild.email] } { -+ set EMAIL_FILE "/usr/local/etc/sguild/sguild.email" - } else { - set EMAIL_FILE "./sguild.email" - } -@@ -548,8 +546,8 @@ if { [file exists $EMAIL_FILE] } { - } - # Load global queries. - if { ![info exists GLOBAL_QRY_FILE] } { -- if { [file exists /etc/sguild/sguild.queries] } { -- set GLOBAL_QRY_FILE "/etc/sguild/sguild.queries" -+ if { [file exists /usr/local/etc/sguild/sguild.queries] } { -+ set GLOBAL_QRY_FILE "/usr/local/etc/sguild/sguild.queries" - } else { - set GLOBAL_QRY_FILE "./sguild.queries" - } -@@ -561,8 +559,8 @@ if { [file exists $GLOBAL_QRY_FILE] } { - } - # Load report queries. - if { ![info exists REPORT_QRY_FILE] } { -- if { [file exists /etc/sguild/sguild.reports] } { -- set REPORT_QRY_FILE "/etc/sguild/sguild.reports" -+ if { [file exists /usr/local/etc/sguild/sguild.reports] } { -+ set REPORT_QRY_FILE "/usr/local/etc/sguild/sguild.reports" - } else { - set REPORT_QRY_FILE "./sguild.reports" - } |