diff options
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch')
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch b/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch index acda8f1ce9..f079d936a4 100644 --- a/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch +++ b/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From be187435911cde6cc3cef6982a508261074f1e56 Mon Sep 17 00:00:00 2001 | 1 | From b02ef7621758f06eb686ef4f620636dbad086eda Mon Sep 17 00:00:00 2001 |
2 | From: Matt Jolly <Matt.Jolly@footclan.ninja> | 2 | From: Matt Jolly <Matt.Jolly@footclan.ninja> |
3 | Date: Thu, 2 Feb 2023 21:05:40 +1100 | 3 | Date: Thu, 2 Feb 2023 21:05:40 +1100 |
4 | Subject: [PATCH] systemd: Add optional support for systemd `sd_notify` | 4 | Subject: [PATCH] systemd: Add optional support for systemd `sd_notify` |
@@ -15,10 +15,10 @@ Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> | |||
15 | 2 files changed, 37 insertions(+) | 15 | 2 files changed, 37 insertions(+) |
16 | 16 | ||
17 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
18 | index 22fee70f..486c189f 100644 | 18 | index 82e8bb7..d1145d3 100644 |
19 | --- a/configure.ac | 19 | --- a/configure.ac |
20 | +++ b/configure.ac | 20 | +++ b/configure.ac |
21 | @@ -4835,6 +4835,29 @@ AC_SUBST([GSSLIBS]) | 21 | @@ -4870,6 +4870,29 @@ AC_SUBST([GSSLIBS]) |
22 | AC_SUBST([K5LIBS]) | 22 | AC_SUBST([K5LIBS]) |
23 | AC_SUBST([CHANNELLIBS]) | 23 | AC_SUBST([CHANNELLIBS]) |
24 | 24 | ||
@@ -48,7 +48,7 @@ index 22fee70f..486c189f 100644 | |||
48 | # Looking for programs, paths and files | 48 | # Looking for programs, paths and files |
49 | 49 | ||
50 | PRIVSEP_PATH=/var/empty | 50 | PRIVSEP_PATH=/var/empty |
51 | @@ -5634,6 +5657,7 @@ echo " libldns support: $LDNS_MSG" | 51 | @@ -5688,6 +5711,7 @@ echo " libldns support: $LDNS_MSG" |
52 | echo " Solaris process contract support: $SPC_MSG" | 52 | echo " Solaris process contract support: $SPC_MSG" |
53 | echo " Solaris project support: $SP_MSG" | 53 | echo " Solaris project support: $SP_MSG" |
54 | echo " Solaris privilege support: $SPP_MSG" | 54 | echo " Solaris privilege support: $SPP_MSG" |
@@ -57,7 +57,7 @@ index 22fee70f..486c189f 100644 | |||
57 | echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" | 57 | echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" |
58 | echo " BSD Auth support: $BSD_AUTH_MSG" | 58 | echo " BSD Auth support: $BSD_AUTH_MSG" |
59 | diff --git a/sshd.c b/sshd.c | 59 | diff --git a/sshd.c b/sshd.c |
60 | index 6321936c..859d6a0b 100644 | 60 | index b4f2b97..6820a41 100644 |
61 | --- a/sshd.c | 61 | --- a/sshd.c |
62 | +++ b/sshd.c | 62 | +++ b/sshd.c |
63 | @@ -88,6 +88,10 @@ | 63 | @@ -88,6 +88,10 @@ |
@@ -71,7 +71,7 @@ index 6321936c..859d6a0b 100644 | |||
71 | #include "xmalloc.h" | 71 | #include "xmalloc.h" |
72 | #include "ssh.h" | 72 | #include "ssh.h" |
73 | #include "ssh2.h" | 73 | #include "ssh2.h" |
74 | @@ -310,6 +314,10 @@ static void | 74 | @@ -308,6 +312,10 @@ static void |
75 | sighup_restart(void) | 75 | sighup_restart(void) |
76 | { | 76 | { |
77 | logit("Received SIGHUP; restarting."); | 77 | logit("Received SIGHUP; restarting."); |
@@ -82,7 +82,7 @@ index 6321936c..859d6a0b 100644 | |||
82 | if (options.pid_file != NULL) | 82 | if (options.pid_file != NULL) |
83 | unlink(options.pid_file); | 83 | unlink(options.pid_file); |
84 | platform_pre_restart(); | 84 | platform_pre_restart(); |
85 | @@ -2086,6 +2094,11 @@ main(int ac, char **av) | 85 | @@ -2093,6 +2101,11 @@ main(int ac, char **av) |
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||
@@ -94,6 +94,3 @@ index 6321936c..859d6a0b 100644 | |||
94 | /* Accept a connection and return in a forked child */ | 94 | /* Accept a connection and return in a forked child */ |
95 | server_accept_loop(&sock_in, &sock_out, | 95 | server_accept_loop(&sock_in, &sock_out, |
96 | &newsock, config_s); | 96 | &newsock, config_s); |
97 | -- | ||
98 | 2.25.1 | ||
99 | |||