|
 |
4d141e4 |
commit 0e22b79bfde45a7cf7a2e51a68ec11c4285f3b31
|
|
|
4d141e4 |
Author: Jakub Jelen <jjelen@redhat.com>
|
|
|
4d141e4 |
Date: Mon Nov 21 15:04:06 2016 +0100
|
|
|
4d141e4 |
|
|
|
4d141e4 |
systemd stuff
|
|
|
4d141e4 |
|
|
|
4d141e4 |
diff --git a/configure.ac b/configure.ac
|
|
|
4d141e4 |
index 2ffc369..162ce92 100644
|
|
|
4d141e4 |
--- a/configure.ac
|
|
|
4d141e4 |
+++ b/configure.ac
|
|
|
4d141e4 |
@@ -4265,6 +4265,30 @@ AC_ARG_WITH([kerberos5],
|
|
|
4d141e4 |
AC_SUBST([GSSLIBS])
|
|
|
4d141e4 |
AC_SUBST([K5LIBS])
|
|
|
4d141e4 |
|
|
|
4d141e4 |
+# Check whether user wants systemd support
|
|
|
4d141e4 |
+SYSTEMD_MSG="no"
|
|
|
4d141e4 |
+AC_ARG_WITH(systemd,
|
|
|
4d141e4 |
+ [ --with-systemd Enable systemd support],
|
|
|
4d141e4 |
+ [ if test "x$withval" != "xno" ; then
|
|
|
4d141e4 |
+ AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no])
|
|
|
4d141e4 |
+ if test "$PKGCONFIG" != "no"; then
|
|
|
4d141e4 |
+ AC_MSG_CHECKING([for libsystemd])
|
|
|
4d141e4 |
+ if $PKGCONFIG --exists libsystemd; then
|
|
|
4d141e4 |
+ SYSTEMD_CFLAGS=`$PKGCONFIG --cflags libsystemd`
|
|
|
4d141e4 |
+ SYSTEMD_LIBS=`$PKGCONFIG --libs libsystemd`
|
|
|
4d141e4 |
+ CPPFLAGS="$CPPFLAGS $SYSTEMD_CFLAGS"
|
|
|
4d141e4 |
+ SSHDLIBS="$SSHDLIBS $SYSTEMD_LIBS"
|
|
|
4d141e4 |
+ AC_MSG_RESULT([yes])
|
|
|
4d141e4 |
+ AC_DEFINE(HAVE_SYSTEMD, 1, [Define if you want systemd support.])
|
|
|
4d141e4 |
+ SYSTEMD_MSG="yes"
|
|
|
4d141e4 |
+ else
|
|
|
4d141e4 |
+ AC_MSG_RESULT([no])
|
|
|
4d141e4 |
+ fi
|
|
|
4d141e4 |
+ fi
|
|
|
4d141e4 |
+ fi ]
|
|
|
4d141e4 |
+)
|
|
|
4d141e4 |
+
|
|
|
4d141e4 |
+
|
|
|
4d141e4 |
# Looking for programs, paths and files
|
|
|
4d141e4 |
|
|
|
4d141e4 |
PRIVSEP_PATH=/var/empty
|
|
|
4d141e4 |
@@ -5097,6 +5121,7 @@ echo " libedit support: $LIBEDIT_MSG"
|
|
|
4d141e4 |
echo " Solaris process contract support: $SPC_MSG"
|
|
|
4d141e4 |
echo " Solaris project support: $SP_MSG"
|
|
|
4d141e4 |
echo " Solaris privilege support: $SPP_MSG"
|
|
|
4d141e4 |
+echo " systemd support: $SYSTEMD_MSG"
|
|
|
4d141e4 |
echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
|
|
|
4d141e4 |
echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
|
|
|
4d141e4 |
echo " BSD Auth support: $BSD_AUTH_MSG"
|
|
|
4d141e4 |
diff --git a/contrib/sshd.service b/contrib/sshd.service
|
|
|
4d141e4 |
new file mode 100644
|
|
|
4d141e4 |
index 0000000..e0d4923
|
|
|
4d141e4 |
--- /dev/null
|
|
|
4d141e4 |
+++ b/contrib/sshd.service
|
|
|
4d141e4 |
@@ -0,0 +1,16 @@
|
|
|
4d141e4 |
+[Unit]
|
|
|
4d141e4 |
+Description=OpenSSH server daemon
|
|
|
4d141e4 |
+Documentation=man:sshd(8) man:sshd_config(5)
|
|
|
4d141e4 |
+After=network.target
|
|
|
4d141e4 |
+
|
|
|
4d141e4 |
+[Service]
|
|
|
4d141e4 |
+Type=notify
|
|
|
4d141e4 |
+ExecStart=/usr/sbin/sshd -D $OPTIONS
|
|
|
4d141e4 |
+ExecReload=/bin/kill -HUP $MAINPID
|
|
|
4d141e4 |
+KillMode=process
|
|
|
4d141e4 |
+Restart=on-failure
|
|
|
4d141e4 |
+RestartPreventExitStatus=255
|
|
|
4d141e4 |
+
|
|
|
4d141e4 |
+[Install]
|
|
|
4d141e4 |
+WantedBy=multi-user.target
|
|
|
4d141e4 |
+
|
|
|
4d141e4 |
diff --git a/sshd.c b/sshd.c
|
|
|
4d141e4 |
index 816611c..b8b9d13 100644
|
|
|
4d141e4 |
--- a/sshd.c
|
|
|
4d141e4 |
+++ b/sshd.c
|
|
|
4d141e4 |
@@ -85,6 +85,10 @@
|
|
|
4d141e4 |
#include <prot.h>
|
|
|
4d141e4 |
#endif
|
|
|
4d141e4 |
|
|
|
4d141e4 |
+#ifdef HAVE_SYSTEMD
|
|
|
4d141e4 |
+#include <systemd/sd-daemon.h>
|
|
|
4d141e4 |
+#endif
|
|
|
4d141e4 |
+
|
|
|
4d141e4 |
#include "xmalloc.h"
|
|
|
4d141e4 |
#include "ssh.h"
|
|
|
4d141e4 |
#include "ssh2.h"
|
|
|
fba2e4a |
@@ -1888,6 +1892,11 @@ main(int ac, char **av)
|
|
|
fba2e4a |
}
|
|
|
fba2e4a |
}
|
|
|
4d141e4 |
|
|
|
4d141e4 |
+#ifdef HAVE_SYSTEMD
|
|
|
fba2e4a |
+ /* Signal systemd that we are ready to accept connections */
|
|
|
fba2e4a |
+ sd_notify(0, "READY=1");
|
|
|
4d141e4 |
+#endif
|
|
|
4d141e4 |
+
|
|
|
fba2e4a |
/* Accept a connection and return in a forked child */
|
|
|
fba2e4a |
server_accept_loop(&sock_in, &sock_out,
|
|
|
fba2e4a |
&newsock, config_s);
|