Update systemd configuration.

seucurity-server.socket is no logner used. All confituration connected
with this socket has been removed.

[Issue#]      N/A
[Bug/Problem] Unused socket was created by systemd.
[Solution]    Remove configuration.

[Verification] Build, run tests.

Change-Id: I4c7d588d6189cca129f7d4ac4b45b290dc1fbb8d

diff --git a/packaging/security-server.spec b/packaging/security-server.spec
index 2a9177f..ed63e09 100644 (file)
--- a/packaging/security-server.spec
+++ b/packaging/security-server.spec
@@ -80,7 +80,6 @@ cp security-server-audit.conf %{buildroot}/etc/security/
 mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
 mkdir -p %{buildroot}/usr/lib/systemd/system/sockets.target.wants
 ln -s ../security-server.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/security-server.service
-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
 ln -s ../security-server-get-gid.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-get-gid.socket
 ln -s ../security-server-privilege-by-pid.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-privilege-by-pid.socket
@@ -131,8 +130,6 @@ fi
 %{_libdir}/libsecurity-server-commons.so.*
 %attr(-,root,root) /usr/lib/systemd/system/multi-user.target.wants/security-server.service
 %attr(-,root,root) /usr/lib/systemd/system/security-server.service
-%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server.socket
-%attr(-,root,root) /usr/lib/systemd/system/security-server.socket
 %attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-data-share.socket
 %attr(-,root,root) /usr/lib/systemd/system/security-server-data-share.socket
 %attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-get-gid.socket

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index 63814ca..d3c924a 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -1,6 +1,5 @@
 INSTALL(FILES
     ${CMAKE_SOURCE_DIR}/systemd/security-server.service
-    ${CMAKE_SOURCE_DIR}/systemd/security-server.socket
     ${CMAKE_SOURCE_DIR}/systemd/security-server-data-share.socket
     ${CMAKE_SOURCE_DIR}/systemd/security-server-get-gid.socket
     ${CMAKE_SOURCE_DIR}/systemd/security-server-privilege-by-pid.socket

diff --git a/systemd/security-server.service b/systemd/security-server.service
index 39a50f8..6a6762a 100644 (file)
--- a/systemd/security-server.service
+++ b/systemd/security-server.service
@@ -4,7 +4,6 @@ Description=Start the security server
 [Service]
 Type=notify
 ExecStart=/usr/bin/security-server
-Sockets=security-server.socket
 Sockets=security-server-data-share.socket
 Sockets=security-server-get-gid.socket
 Sockets=security-server-privilege-by-pid.socket

diff --git a/systemd/security-server.socket b/systemd/security-server.socket
deleted file mode 100644 (file)
index fb715d5..0000000
--- a/systemd/security-server.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Socket]
-ListenStream=/tmp/.security_server.sock
-SocketMode=0777
-SmackLabelIPIn=*
-SmackLabelIPOut=@
-
-[Install]
-WantedBy=sockets.target