Blame SOURCES/0015-Actually-setfacl-each-directory-of-our-key-storage.patch

fe5aa1
From 0df758bbb282f9d4a81818b6f7816eb0eb663519 Mon Sep 17 00:00:00 2001
fe5aa1
From: Peter Jones <pjones@redhat.com>
fe5aa1
Date: Mon, 16 May 2016 15:25:53 -0400
fe5aa1
Subject: [PATCH 15/15] Actually setfacl /each/ directory of our key storage.
fe5aa1
fe5aa1
Signed-off-by: Peter Jones <pjones@redhat.com>
fe5aa1
(cherry picked from commit f0c285fe74f00402acb72cb4ae91891006e9cfa4)
fe5aa1
---
fe5aa1
 src/pesign-authorize-groups | 6 +++---
fe5aa1
 src/pesign-authorize-users  | 6 +++---
fe5aa1
 2 files changed, 6 insertions(+), 6 deletions(-)
fe5aa1
fe5aa1
diff --git a/src/pesign-authorize-groups b/src/pesign-authorize-groups
fe5aa1
index a4f895e..cf51fb6 100644
fe5aa1
--- a/src/pesign-authorize-groups
fe5aa1
+++ b/src/pesign-authorize-groups
fe5aa1
@@ -18,10 +18,10 @@ if [ -r /etc/pesign/groups ]; then
fe5aa1
 		setfacl -m g:${group}:rw /var/run/pesign/socket
fe5aa1
 	    fi
fe5aa1
 	fi
fe5aa1
-	for x in /etc/pki/pesign* ; do
fe5aa1
+	for x in /etc/pki/pesign*/ ; do
fe5aa1
 	    if [ -d ${x} ]; then
fe5aa1
-		setfacl -m g:${group}:rx /etc/pki/pesign
fe5aa1
-		for y in ${x}/{cert8,key3,secmod}.db ; do
fe5aa1
+		setfacl -m g:${group}:rx ${x}
fe5aa1
+		for y in ${x}{cert8,key3,secmod}.db ; do
fe5aa1
 		    setfacl -m g:${group}:rw ${y}
fe5aa1
 		done
fe5aa1
 	    fi
fe5aa1
diff --git a/src/pesign-authorize-users b/src/pesign-authorize-users
fe5aa1
index 8b9a885..940138e 100644
fe5aa1
--- a/src/pesign-authorize-users
fe5aa1
+++ b/src/pesign-authorize-users
fe5aa1
@@ -18,10 +18,10 @@ if [ -r /etc/pesign/users ]; then
fe5aa1
 		setfacl -m g:${username}:rw /var/run/pesign/socket
fe5aa1
 	    fi
fe5aa1
 	fi
fe5aa1
-	for x in /etc/pki/pesign* ; do
fe5aa1
+	for x in /etc/pki/pesign*/ ; do
fe5aa1
 	    if [ -d ${x} ]; then
fe5aa1
-		setfacl -m g:${username}:rx /etc/pki/pesign
fe5aa1
-		for y in ${x}/{cert8,key3,secmod}.db ; do
fe5aa1
+		setfacl -m g:${username}:rx ${x}
fe5aa1
+		for y in ${x}{cert8,key3,secmod}.db ; do
fe5aa1
 		    setfacl -m g:${username}:rw ${y}
fe5aa1
 		done
fe5aa1
 	    fi
fe5aa1
-- 
fe5aa1
2.5.5
fe5aa1