Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > d236c5da97a239a1b6991cfba2865b66 > files > 54

cman-2.0.115-68.el5_6.1.src.rpm

From 1441b5d066bc362b44573bee69d793403067ef2e Mon Sep 17 00:00:00 2001
From: Marek 'marx' Grac <mgrac@redhat.com>
Date: Sun, 20 Dec 2009 13:54:19 +0100
Subject: [PATCH] fence_egenera: insecure temporary file

Log directory changed to /var/log/cluster instead of /tmp. Directory
is created in fence agent Makefile if needed.

Resolves: rhbz#519682
---
 fence/agents/egenera/Makefile         |    3 +++
 fence/agents/egenera/fence_egenera.pl |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/fence/agents/egenera/Makefile b/fence/agents/egenera/Makefile
index 7158702..0318646 100644
--- a/fence/agents/egenera/Makefile
+++ b/fence/agents/egenera/Makefile
@@ -13,6 +13,7 @@
 
 SOURCE= fence_egenera.pl
 TARGET= fence_egenera
+LOGDIR= /var/log/cluster
 
 top_srcdir=../..
 include ${top_srcdir}/make/defines.mk
@@ -26,6 +27,7 @@ fence_egenera: fence_egenera.pl
 	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
 	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
+	sed -ie 's#@''LOGDIR@#${LOGDIR}#g' $(TARGET)
 	chmod +x $(TARGET)
 
 install: all
@@ -33,6 +35,7 @@ install: all
 		install -d ${sbindir}; \
 	fi
 	install -m755 ${TARGET} ${sbindir}
+	install -d ${DESTDIR}/${LOGDIR}
 
 clean:
 	rm -f $(TARGET)
diff --git a/fence/agents/egenera/fence_egenera.pl b/fence/agents/egenera/fence_egenera.pl
index 928ebb2..8607919 100755
--- a/fence/agents/egenera/fence_egenera.pl
+++ b/fence/agents/egenera/fence_egenera.pl
@@ -306,7 +306,7 @@ sub pserver_shutdown
 {
 	my $rtrn=1;
         local *egen_log;
-        open(egen_log,">>/tmp/eglog");
+        open(egen_log,">>/@LOGDIR@/eglog");
   print egen_log "Attempting shutdown at ".`date`."\n";
 	for (my $trys=0; $trys<20; $trys++)
 	{
-- 
1.6.0.6