[pkg-bacula-commits] [bacula] 03/06: Revert changes to start as non-root

[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 e52ee25c9f992e6d5c63bd96ea6fd4198319dea7
Author: Sven Hartge <sven at svenhartge.de>
Date:   Sat Sep 10 21:23:48 2016 +0200

    Revert changes to start as non-root
---
 debian/bacula-fd.init | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/debian/bacula-fd.init b/debian/bacula-fd.init
index c44c44a..76eb8a4 100644
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@ -31,7 +31,6 @@ PORT=9102
 DESC="Bacula File daemon"
 BUSER="root"
 BGROUP="root"
-KEEPCAPS=""
 
 test -x $DAEMON || exit 0
 
@@ -45,15 +44,6 @@ if [ -r /etc/default/$NAME ]; then
 	. /etc/default/$NAME
 fi
 
-ENABLE_NONROOT="${ENABLE_NONROOT:-false}"
-
-if [ "$ENABLE_NONROOT" = "true" ]; then 
-	BUSER="bacula"
-	BGROUP="bacula"
-	# KEEPCAPS just needed for configtest
-	KEEPCAPS="-k"
-fi
-
 CONFIG="${CONFIG:-/etc/bacula/$NAME.conf}"
 
 create_run_dir
@@ -62,7 +52,7 @@ PIDFILE=/run/bacula/$NAME.$PORT.pid
 
 do_start()
 {
-	if $DAEMON -u $BUSER -g $BGROUP $KEEPCAPS -t -c $CONFIG > /dev/null 2>&1; then
+	if $DAEMON -u $BUSER -g $BGROUP -t -c $CONFIG > /dev/null 2>&1; then
 		start-stop-daemon --start --quiet --pidfile $PIDFILE \
 		--oknodo --exec $DAEMON --chuid $BUSER:$BGROUP -- -c $CONFIG 
 		return 0

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