Add keyd support for systemd socket activation

[onak.git] / keyd.c

diff --git a/keyd.c b/keyd.c
index 18e9ddca873a84e37c172408bb0ecdc20b611b19..6a171d43b3f575e8b92b17c2f96c6b33f0b8ff97 100644 (file)
--- a/keyd.c
+++ b/keyd.c
@@ -31,6 +31,12 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "config.h"
+
+#ifdef HAVE_SYSTEMD
+#include <systemd/sd-daemon.h>
+#endif
+
 #include "charfuncs.h"
 #include "cleanup.h"
 #include "keyd.h"
@@ -46,6 +52,10 @@
 /* Maximum number of clients we're prepared to accept at once */
 #define MAX_CLIENTS 16
 
+#ifdef HAVE_SYSTEMD
+static bool using_socket_activation = false;
+#endif
+
 static struct keyd_stats *stats;
 
 static void daemonize(void)
@@ -189,26 +199,47 @@ static int sock_init(const char *sockname)
        struct sockaddr_un sock;
        int                fd = -1;
        int                ret = -1;
+#ifdef HAVE_SYSTEMD
+       int                n;
 
-       fd = socket(PF_UNIX, SOCK_STREAM, 0);
-       if (fd != -1) {
-               ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
-       }
+       n = sd_listen_fds(0);
+       if (n > 1) {
+               logthing(LOGTHING_ERROR,
+                       "Too many file descriptors received from systemd.");
+       } else if (n == 1) {
+               fd = SD_LISTEN_FDS_START + 0;
+               if (sd_is_socket_unix(fd, SOCK_STREAM, 1, NULL, 0) <= 0) {
+                       logthing(LOGTHING_ERROR,
+                               "systemd passed an invalid socket.");
+                       fd = -1;
+               }
+               using_socket_activation = true;
+       } else {
+#endif
+               fd = socket(PF_UNIX, SOCK_STREAM, 0);
+               if (fd != -1) {
+                       ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
+               }
 
-       if (ret != -1) {
-               sock.sun_family = AF_UNIX;
-               strncpy(sock.sun_path, sockname, sizeof(sock.sun_path) - 1);
-               unlink(sockname);
-               ret = bind(fd, (struct sockaddr *) &sock, sizeof(sock));
-       }
+               if (ret != -1) {
+                       sock.sun_family = AF_UNIX;
+                       strncpy(sock.sun_path, sockname,
+                                       sizeof(sock.sun_path) - 1);
+                       unlink(sockname);
+                       ret = bind(fd, (struct sockaddr *) &sock,
+                                       sizeof(sock));
+               }
 
-       if (ret != -1) {
-               ret = listen(fd, 5);
-               if (ret == -1) {
-                       close(fd);
-                       fd = -1;
+               if (ret != -1) {
+                       ret = listen(fd, 5);
+                       if (ret == -1) {
+                               close(fd);
+                               fd = -1;
+                       }
                }
+#ifdef HAVE_SYSTEMD
        }
+#endif
 
        return fd;
 }
@@ -680,8 +711,14 @@ int main(int argc, char *argv[])
                        }
                }
                dbctx->cleanupdb(dbctx);
-               sock_close(fd);
-               unlink(sockname);
+#ifdef HAVE_SYSTEMD
+               if (!using_socket_activation) {
+#endif
+                       sock_close(fd);
+                       unlink(sockname);
+#ifdef HAVE_SYSTEMD
+               }
+#endif
        }
 
        free(stats);