On 11/1/2015 4:15 AM, matt darfeuille wrote:
> Hi tom, thank you for explaining the changes you made!
>
> Are the patches also going to be in beta2?
Yes
>
> Patching WRTLOGGING1.patch failed!:
> $ patch ${HOME}/shorewall/5.0.1.1/shorewall-core-5.0.1.1/lib.cli
> WRTLOGGING1.patch
> (Stripping trailing CRs from patch; use --binary to disable.)
> patching file
> /home/matt/shorewall/5.0.1.1/shorewall-core-5.0.1.1/lib.cli
> Hunk #1 FAILED at 158.
>
> Assuming that what need to be changed is the if in case statement
> with an return value of 0 in the function syslog_circular_buffer:
> from
> if [ x$arg = x-S ]; then
> echo Yes
> return
> fi
> to
> case $arg in
> -S)
I intended that to be -S*, assuming that there might be a number
directly following as with -C in syslogd. If that's not the case, we can
simply leave the old test there.
> return 0
> ;;
> esac
>
> then the line in the function setup_logread
> if [ -n "$(syslog_circular_buffer)" ]; then
> should also be changed to
> if syslog_circular_buffer; then
>
Yes - here's what I have:
...
#
# Determine if 'syslog -C' is running
#
syslog_circular_buffer() {
local pid
local tty
local flags
local time
local path
local args
local arg
ps w 2> /dev/null | while read pid tty stat time path args; do
case $path in
syslogd|*/syslogd)
for arg in $args; do
case $arg in
-C*)
return 0
;;
esac
done
;;
logd|*/logd)
for arg in $args; do
case $arg in
-S*)
return 0
;;
esac
done
;;
esac
done
return 1
}
setup_logread() {
[ -z "$LOGFILE" ] && LOGFILE=/var/log/messages
if syslog_circular_buffer; then
if qt mywhich tac; then
...
> --
> The value of $LOGFILE should also be change if printed(EG: in
> function logwatch):
> echo "Dropped/Rejected Packet Log ($LOGFILE)"
> or it will print the default value of $LOGFILE(/var/log/messages)!
>
Okay
> request:
> Could the exit status of the scp command be properly returned?(it
> returns always 0 even on failure):
> To illustrate my point it is failing on purpose!:
>
> $ shorewall remote-start system && echo ok || echo failed
>
> Copying firewall and firewall.conf to /var/lib/shorewall-lite...
> root@path:/var/lib/shorewall-lite: No such file or directory
> ok
>
I'll take a look.
-Tom
--
Tom Eastep \ When I die, I want to go like my Grandfather who
Shoreline, \ died peacefully in his sleep. Not screaming like
Washington, USA \ all of the passengers in his car
http://shorewall.net \________________________________________________
------------------------------------------------------------------------------
_______________________________________________
Shorewall-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-users
