From b545eef5da36976a4b2600bff73962c3a6d32046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Peccatte?= <benoit.peccatte@normation.com>
Date: Mon, 24 Oct 2016 17:14:05 +0200
Subject: [PATCH] Fixes #9520: Sometime ppkeys is not 700

---
 rudder-agent/SOURCES/rudder-agent-postinst | 2 ++
 rudder-agent/SPECS/rudder-agent.spec       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/rudder-agent/SOURCES/rudder-agent-postinst b/rudder-agent/SOURCES/rudder-agent-postinst
index 1c5168d42..d3286960b 100755
--- a/rudder-agent/SOURCES/rudder-agent-postinst
+++ b/rudder-agent/SOURCES/rudder-agent-postinst
@@ -77,6 +77,8 @@ fi
 if [ ! -f ${CFE_DIR}/ppkeys/localhost.priv ]
 then
   echo -n "INFO: Creating keys for CFEngine agent..."
+  # The chmod is a workaround for the limitations of rpm in rhel6 but it could be useful in other situations
+  chmod 700 ${CFE_DIR}/ppkeys
   ${CFE_DIR}/bin/cf-key >> ${LOG_FILE} 2>&1
   echo " Done."
 fi
diff --git a/rudder-agent/SPECS/rudder-agent.spec b/rudder-agent/SPECS/rudder-agent.spec
index 8d9183b80..32e4a7146 100644
--- a/rudder-agent/SPECS/rudder-agent.spec
+++ b/rudder-agent/SPECS/rudder-agent.spec
@@ -460,7 +460,7 @@ rm -f %{_builddir}/file.list.%{name}
 # existing file declared in conffiles
 %ghost %{rudderdir}/etc/uuid.hive
 
-%attr(0700, -, -) %{ruddervardir}/cfengine-community/ppkeys
+%attr(0700, -, -) %dir %{ruddervardir}/cfengine-community/ppkeys
 %dir %{ruddervardir}/cfengine-community/bin
 %dir %{ruddervardir}/cfengine-community/inputs
 %dir %{ruddervardir}/tmp