Remove deprecated code and scripts.

Removed:
 * init scripts
 * deprecated lines from spec file
 * remove deprecated code from old security server

[Issue#]   SSDWSSP-146
[Bug]      N/A
[Cause]    N/A
[Problem]  Security server starts twice (by systemd and init).
[Solution] Remove init scripts.

[Verification] Reinstall security-server. Reboot target. Run tests.

Change-Id: Ibac028b8b452284e7447b7fcb81b9a8927aded68

diff --git a/packaging/security-server.spec b/packaging/security-server.spec
index 0e23ab6..4ae0e81 100644 (file)
--- a/packaging/security-server.spec
+++ b/packaging/security-server.spec
@@ -80,22 +80,20 @@ ln -s ../security-server.service %{buildroot}/usr/lib/systemd/system/multi-user.
 ln -s ../security-server.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server.socket
 ln -s ../security-server-data-share.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-data-share.socket
 
-mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
-install -m 0644 %{SOURCE3} %{buildroot}/usr/lib/systemd/system/security-server.service
-ln -s ../security-server.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/security-server.service
-
-
-%preun
-if [ $1 == 0 ]; then
-    systemctl stop security-server.service
-fi
+%clean
+rm -rf %{buildroot}
 
 %post
 systemctl daemon-reload
-if [ $1 == 1 ]; then
+if [ "$1" = 1 ]; then
     systemctl restart security-server.service
 fi
 
+%preun
+if [ "$1" = 0 ]; then
+    systemctl stop security-server.service
+fi
+
 %postun
 systemctl daemon-reload
 
@@ -104,10 +102,7 @@ systemctl daemon-reload
 %postun -n libsecurity-server-client -p /sbin/ldconfig
 
 %files -n security-server
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-/usr/lib/systemd/system/multi-user.target.wants/security-server.service
-/usr/lib/systemd/system/security-server.service
+%manifest %{_datadir}/security-server.manifest
 %attr(755,root,root) /usr/bin/security-server
 %{_libdir}/libsecurity-server-commons.so.*
 %attr(-,root,root) /usr/lib/systemd/system/multi-user.target.wants/security-server.service

diff --git a/src/security-serverd b/src/security-serverd
deleted file mode 100644 (file)
index 48fbefc..0000000
--- a/src/security-serverd
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# start secure-storage server
-/usr/bin/security-server &

diff --git a/src/server/security-server-main.c b/src/server/security-server-main.c
index 0756e31..894baed 100644 (file)
--- a/src/server/security-server-main.c
+++ b/src/server/security-server-main.c
@@ -69,8 +69,6 @@ struct security_server_thread_param {
     int thread_status;
 };
 
-static int netlink_enabled = 1; /* prevent memory leaks when netlink is disabled */
-
 
 /************************************************************************************************/
 /* Just for test. This code must be removed on release */