[pkg-bacula-commits] [bacula] 02/06: Revert "Check for capabilities"

[Sven Hartge]

This is an automated email from the git hooks/post-receive script.

hartge-guest pushed a commit to branch hardcode-users
in repository bacula.

commit 20a1a29dad521302632a49fb93c84da56045b0ff
Author: Sven Hartge <sven at svenhartge.de>
Date:   Sat Sep 10 21:20:59 2016 +0200

    Revert "Check for capabilities"
    
    This reverts commit e4db330b6877a751a079a7044ec4f75db1ac7c27.
---
 debian/bacula-fd.init | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/debian/bacula-fd.init b/debian/bacula-fd.init
index c624804..c44c44a 100644
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@ -29,6 +29,9 @@ DAEMON=/usr/sbin/bacula-fd
 NAME="bacula-fd"
 PORT=9102
 DESC="Bacula File daemon"
+BUSER="root"
+BGROUP="root"
+KEEPCAPS=""
 
 test -x $DAEMON || exit 0
 
@@ -44,24 +47,11 @@ fi
 
 ENABLE_NONROOT="${ENABLE_NONROOT:-false}"
 
-if [ -x /sbin/getcap ]; then
-	GETCAPS=`/sbin/getcap $DAEMON`
-	if [ "`echo ${GETCAPS##* }`" = "cap_dac_read_search+ep" ]; then
-		HASCAPS=true
-	else
-		HASCAPS=false
-	fi
-fi
-
-if [ "$HASCAPS" = true -a "$ENABLE_NONROOT" = "true" ]; then 
+if [ "$ENABLE_NONROOT" = "true" ]; then 
 	BUSER="bacula"
 	BGROUP="bacula"
 	# KEEPCAPS just needed for configtest
 	KEEPCAPS="-k"
-else
-	BUSER="root"
-	BGROUP="root"
-	KEEPCAPS=""
 fi
 
 CONFIG="${CONFIG:-/etc/bacula/$NAME.conf}"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git