From 88ab6e28932e9f9b2d3546c6f5ed4fb3023421f5 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Wed, 30 Oct 2019 16:22:36 +0200
Subject: [PATCH] [ssu] Protect SSU dbus interface with ssu group. Contributes
 to JB#47997

---
 dbus/org.nemo.ssu.conf | 2 +-
 rpm/ssu.spec           | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dbus/org.nemo.ssu.conf b/dbus/org.nemo.ssu.conf
index 1941286..e7cd389 100644
--- a/dbus/org.nemo.ssu.conf
+++ b/dbus/org.nemo.ssu.conf
@@ -8,7 +8,7 @@
     <allow send_destination="org.nemo.ssu" send_interface="org.nemo.ssu"/>
   </policy>
 
-  <policy group="system">
+  <policy group="ssu">
     <allow send_destination="org.nemo.ssu" send_interface="org.nemo.ssu"/>
     <allow send_destination="org.nemo.ssu" send_interface="org.freedesktop.DBus.Introspectable"/>
     <allow send_destination="org.nemo.ssu" send_interface="org.freedesktop.DBus.Peer"/>
diff --git a/rpm/ssu.spec b/rpm/ssu.spec
index aa528a3..344f5c5 100644
--- a/rpm/ssu.spec
+++ b/rpm/ssu.spec
@@ -17,6 +17,7 @@ BuildRequires: pkgconfig(libshadowutils)
 BuildRequires: pkgconfig(connman-qt5)
 BuildRequires: oneshot
 BuildRequires: doxygen
+Requires(pre): sailfish-setup
 Requires(pre): shadow-utils
 Requires(pre): /usr/bin/groupadd-user
 Requires(postun): shadow-utils
@@ -188,8 +189,6 @@ cd .. && cp -R doc/html/* %{buildroot}/%{_docdir}/%{name}/
 
 
 %pre
-groupadd -rf ssu
-groupadd-user ssu
 if [ -f /etc/ssu/ssu.ini ]; then
   chgrp ssu /etc/ssu/ssu.ini
   chmod 664 /etc/ssu/ssu.ini