diff options
Diffstat (limited to 'security/sguil-server/files/patch-sguild')
| -rw-r--r-- | security/sguil-server/files/patch-sguild | 84 |
1 files changed, 39 insertions, 45 deletions
diff --git a/security/sguil-server/files/patch-sguild b/security/sguil-server/files/patch-sguild index 825011b21a17..360faab85816 100644 --- a/security/sguil-server/files/patch-sguild +++ b/security/sguil-server/files/patch-sguild @@ -1,105 +1,99 @@ ---- sguild.orig 2008-04-08 22:02:24.000000000 -0500 -+++ sguild 2008-04-08 22:09:11.000000000 -0500 -@@ -235,7 +235,7 @@ +--- sguild.orig 2012-12-17 20:54:14.000000000 +0000 ++++ sguild 2012-12-17 20:56:47.000000000 +0000 +@@ -1,6 +1,4 @@ + #!/bin/sh +-# Run tcl from users PATH \ +-exec tclsh "$0" "$@" + + # $Id: sguild,v 1.193 2011/05/29 15:41:16 bamm Exp $ # + +@@ -218,7 +216,7 @@ + ################################## + + # 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 } + +@@ -318,7 +316,7 @@ # Check for certs if {![info exists CERTS_PATH]} { - set CERTS_PATH /etc/sguild/certs -+ set CERTS_PATH /usr/local/etc/sguil-server/certs ++ set CERTS_PATH /usr/local/etc/sguild/certs } -@@ -265,13 +265,13 @@ +@@ -348,13 +346,13 @@ 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/sguil-server/sguild.conf] } { -+ set CONF_FILE /usr/local/etc/sguil-server/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 { puts "Couldn't determine where the sguil config file is" - puts "Looked for ./sguild.conf and /etc/sguild/sguild.conf." -+ puts "Looked for ./sguild.conf and /usr/local/etc/sguil-server/sguild.conf." ++ puts "Looked for ./sguild.conf and /usr/local/etc/sguild/sguild.conf." DisplayUsage $argv0 } } -@@ -354,17 +354,17 @@ - # Check for a valid USERS file - if { ![info exists USERS_FILE] } { - # No users file was specified. Go with the defaults -- if { [file exists /etc/sguild/sguild.users] } { -- set USERS_FILE "/etc/sguild/sguild.users" -+ if { [file exists /usr/local/etc/sguil-server/sguild.users] } { -+ set USERS_FILE "/usr/local/etc/sguil-server/sguild.users" - } elseif { [file exists ./sguild.users] } { - set USERS_FILE "./sguild.users" - } else { - if { [info exists ADDUSER] && $ADDUSER } { -- CreateUsersFile "/etc/sguild/sguild.users" -+ CreateUsersFile "/usr/local/etc/sguil-server/sguild.users" - } else { - set DEBUG 2 - LogMessage "ERROR: Could not find a sguild.users file." -- LogMessage " Checked in ./ and /etc/sguild/" -+ LogMessage " Checked in ./ and /usr/local/etc/sguil-server/" - DisplayUsage $argv0 - } - } -@@ -392,8 +392,8 @@ +@@ -476,8 +474,8 @@ # 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/sguil-server/sguild.access] } { -+ set ACCESS_FILE "/usr/local/etc/sguil-server/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 { -@@ -407,8 +407,8 @@ +@@ -491,8 +489,8 @@ } # Load auto cat config if { ![info exists AUTOCAT_FILE] } { - if { [file exists /etc/sguild/autocat.conf] } { - set AUTOCAT_FILE "/etc/sguild/autocat.conf" -+ if { [file exists /usr/local/etc/sguil-server/autocat.conf] } { -+ set AUTOCAT_FILE "/usr/local/etc/sguil-server/autocat.conf" ++ if { [file exists /usr/local/etc/sguild/autocat.conf] } { ++ set AUTOCAT_FILE "/usr/local/etc/sguild/autocat.conf" } else { set AUTOCAT_FILE "./autocat.conf" } -@@ -418,8 +418,8 @@ +@@ -502,8 +500,8 @@ } # 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/sguil-server/sguild.email] } { -+ set EMAIL_FILE "/usr/local/etc/sguil-server/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" } -@@ -431,8 +431,8 @@ +@@ -515,8 +513,8 @@ } # 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/sguil-server/sguild.queries] } { -+ set GLOBAL_QRY_FILE "/usr/local/etc/sguil-server/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" } -@@ -444,8 +444,8 @@ +@@ -528,8 +526,8 @@ } # 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/sguil-server/sguild.reports] } { -+ set REPORT_QRY_FILE "/usr/local/etc/sguil-server/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" } |