Remove deprecated code related to sockets.

Socket "exec-path" was deprecated and was not used.
Service "echo" was removed and definition in protocol.h is not required.

[Issue#]       N/A
[Bug/Solution] N/A
[Problem]      Security-server have got 1 additional socket open.
[Solution]     Remove deprecated code and systemd configuration.

[Verification] Build, run tests.

Change-Id: If1ce352b2ecfa5e9d14e5367d4e3b1b2f8f85d07

diff --git a/packaging/security-server.spec b/packaging/security-server.spec
index 161541d..d150dcd 100644 (file)
--- a/packaging/security-server.spec
+++ b/packaging/security-server.spec
@@ -83,7 +83,6 @@ ln -s ../security-server.service %{buildroot}/usr/lib/systemd/system/multi-user.
 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
-ln -s ../security-server-exec-path.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-exec-path.socket
 ln -s ../security-server-app-permissions.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-app-permissions.socket
 ln -s ../security-server-cookie-get.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-cookie-get.socket
 ln -s ../security-server-cookie-check.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-cookie-check.socket
@@ -137,8 +136,6 @@ fi
 %attr(-,root,root) /usr/lib/systemd/system/security-server-get-gid.socket
 %attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-privilege-by-pid.socket
 %attr(-,root,root) /usr/lib/systemd/system/security-server-privilege-by-pid.socket
-%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-exec-path.socket
-%attr(-,root,root) /usr/lib/systemd/system/security-server-exec-path.socket
 %attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-app-permissions.socket
 %attr(-,root,root) /usr/lib/systemd/system/security-server-app-permissions.socket
 %attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-cookie-get.socket

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index 9aebdda..9503b72 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -3,7 +3,6 @@ INSTALL(FILES
     ${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
-    ${CMAKE_SOURCE_DIR}/systemd/security-server-exec-path.socket
     ${CMAKE_SOURCE_DIR}/systemd/security-server-app-permissions.socket
     ${CMAKE_SOURCE_DIR}/systemd/security-server-cookie-get.socket
     ${CMAKE_SOURCE_DIR}/systemd/security-server-cookie-check.socket

diff --git a/systemd/security-server-exec-path.socket b/systemd/security-server-exec-path.socket
deleted file mode 100644 (file)
index 933b93d..0000000
--- a/systemd/security-server-exec-path.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Socket]
-ListenStream=/tmp/.security-server-api-exec-path.sock
-SocketMode=0777
-SmackLabelIPIn=*
-SmackLabelIPOut=@
-
-Service=security-server.service
-
-[Install]
-WantedBy=sockets.target

diff --git a/systemd/security-server.service b/systemd/security-server.service
index c32dd9b..06a016d 100644 (file)
--- a/systemd/security-server.service
+++ b/systemd/security-server.service
@@ -7,7 +7,6 @@ ExecStart=/usr/bin/security-server
 Sockets=security-server-data-share.socket
 Sockets=security-server-get-gid.socket
 Sockets=security-server-privilege-by-pid.socket
-Sockets=security-server-exec-path.socket
 Sockets=security-server-app-permissions.socket
 Sockets=security-server-app-privilege-by-name.socket
 Sockets=security-server-cookie-get.socket