Attachment 2950 Details for Bug 2641 – fixed patch

[patch] fixed patch

file_2641.txt (text/plain), 2.69 KB, created by Jakub Jelen on 2017-03-02 00:39:09 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Jelen

Created: 2017-03-02 00:39:09 AEDT

Size: 2.69 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 2641: 2893 | 2896 | 2950 | 3099