streams: Named systemd sockets are only supported since systemd v227

diff --git a/configure.ac b/configure.ac
index a3d349db71338060a529a679fbf8fc004411b975..2d9ab05c8df6ccdae783f937569262d42ba23662 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1002,6 +1002,10 @@ if test x$systemd = xtrue; then
                 AC_SUBST(systemd_journal_CFLAGS)
                 AC_SUBST(systemd_journal_LIBS)]
        )
+       saved_LIBS=$LIBS
+       LIBS="$systemd_LIBS $systemd_daemon_LIBS"
+       AC_CHECK_FUNCS(sd_listen_fds_with_names)
+       LIBS=$saved_LIBS
 fi
 
 if test x$tss_trousers = xtrue; then

diff --git a/src/libstrongswan/networking/streams/stream_service_systemd.c b/src/libstrongswan/networking/streams/stream_service_systemd.c
index 64b92836aa53e537f268463393e34291522df217..5c6b3f69056f91c679ecf794f7e698b434600b8e 100644 (file)
--- a/src/libstrongswan/networking/streams/stream_service_systemd.c
+++ b/src/libstrongswan/networking/streams/stream_service_systemd.c
@@ -29,6 +29,11 @@
  */
 stream_service_t *stream_service_create_systemd(char *uri, int backlog)
 {
+#ifndef HAVE_SD_LISTEN_FDS_WITH_NAMES
+       DBG1(DBG_NET, "unable to open stream URI '%s': named systemd sockets not "
+                "supported", uri);
+       return NULL;
+#else
        int i, num_fds, fd;
        char **fdmap;
 
@@ -62,4 +67,5 @@ stream_service_t *stream_service_create_systemd(char *uri, int backlog)
                return NULL;
        }
        return stream_service_create_from_fd(fd);
+#endif
 }