From 8e9d72071e5b717c23f9ea0a831c0d942efccf29 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Wed, 27 Jun 2018 14:48:11 +0200
Subject: [PATCH] $USER can be root or $PKIUSER

---
 shellpki.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shellpki.sh b/shellpki.sh
index 2db71fb..a4c13f5 100755
--- a/shellpki.sh
+++ b/shellpki.sh
@@ -398,13 +398,13 @@ check() {
 }
 
 main() {
-    [ "$(id -u)" -eq 0 ] || error "Please become root before running ${0} !"
-
     # default config
     # TODO : override with /etc/default/shellpki
     CONFFILE="/etc/shellpki/openssl.cnf"
     PKIUSER="shellpki"
 
+    [ "${USER}" != "root" ] || [ "${USER}" != "${PKIUSER}" ] || error "Please become root before running ${0} !"
+
     # retrieve CA path from config file
     CADIR=$(grep -E "^dir" "${CONFFILE}" | cut -d'=' -f2|xargs -n1)
     CAKEY=$(grep -E "^private_key" "${CONFFILE}" | cut -d'=' -f2|xargs -n1|sed "s~\$dir~${CADIR}~")