diff options
Diffstat (limited to 'meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch')
-rw-r--r-- | meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch | 44 |
1 files changed, 37 insertions, 7 deletions
diff --git a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch index 4bb6be43ed..628db42136 100644 --- a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch +++ b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | Disable use of syslog for shadow-native tools | 1 | From 8b845fff891798a03bdf21354b52e4487c2c0200 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Thu, 14 Apr 2022 23:11:53 +0000 | ||
4 | Subject: [PATCH] Disable use of syslog for shadow-native tools | ||
2 | 5 | ||
3 | Disable use of syslog to prevent sysroot user and group additions from | 6 | Disable use of syslog to prevent sysroot user and group additions from |
4 | writing entries to the host's syslog. This patch should only be used | 7 | writing entries to the host's syslog. This patch should only be used |
@@ -6,17 +9,44 @@ with the shadow-native recipe. | |||
6 | 9 | ||
7 | Upstream-Status: Inappropriate [OE specific configuration] | 10 | Upstream-Status: Inappropriate [OE specific configuration] |
8 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 11 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
12 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
9 | 13 | ||
10 | Index: shadow-4.11.1/configure.ac | 14 | --- |
11 | =================================================================== | 15 | configure.ac | 2 +- |
12 | --- shadow-4.11.1.orig/configure.ac | 16 | src/login_nopam.c | 3 ++- |
13 | +++ shadow-4.11.1/configure.ac | 17 | 2 files changed, 3 insertions(+), 2 deletions(-) |
14 | @@ -204,7 +204,7 @@ AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$sha | 18 | |
19 | diff --git a/configure.ac b/configure.ac | ||
20 | index 5dcae19..b2c58f5 100644 | ||
21 | --- a/configure.ac | ||
22 | +++ b/configure.ac | ||
23 | @@ -204,7 +204,7 @@ AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$shadow_cv_passwd_dir/passwd", | ||
15 | [Path to passwd program.]) | 24 | [Path to passwd program.]) |
16 | 25 | ||
17 | dnl XXX - quick hack, should disappear before anyone notices :). | 26 | dnl XXX - quick hack, should disappear before anyone notices :). |
18 | -AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) | 27 | -AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) |
19 | +AC_DEFINE(USE_SYSLOG, 0, [Define to use syslog().]) | 28 | +#AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) |
20 | if test "$ac_cv_func_ruserok" = "yes"; then | 29 | if test "$ac_cv_func_ruserok" = "yes"; then |
21 | AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for rlogind.]) | 30 | AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for rlogind.]) |
22 | AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value (0 or 1).]) | 31 | AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value (0 or 1).]) |
32 | diff --git a/src/login_nopam.c b/src/login_nopam.c | ||
33 | index df6ba88..fc24e13 100644 | ||
34 | --- a/src/login_nopam.c | ||
35 | +++ b/src/login_nopam.c | ||
36 | @@ -29,7 +29,6 @@ | ||
37 | #ifndef USE_PAM | ||
38 | #ident "$Id$" | ||
39 | |||
40 | -#include "prototypes.h" | ||
41 | /* | ||
42 | * This module implements a simple but effective form of login access | ||
43 | * control based on login names and on host (or domain) names, internet | ||
44 | @@ -57,6 +56,8 @@ | ||
45 | #include <netinet/in.h> | ||
46 | #include <arpa/inet.h> /* for inet_ntoa() */ | ||
47 | |||
48 | +#include "prototypes.h" | ||
49 | + | ||
50 | #if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 64) | ||
51 | #undef MAXHOSTNAMELEN | ||
52 | #define MAXHOSTNAMELEN 256 | ||