blob: fa1532c8317ef563f9bb926984aaee927e5f9782 [file] [log] [blame]
Andrew Geissler517393d2023-01-13 08:55:19 -06001From 85d0444229ee3d14fefcf10d093f49c862826f82 Mon Sep 17 00:00:00 2001
Patrick Williams03907ee2022-05-01 06:28:52 -05002From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Thu, 14 Apr 2022 23:11:53 +0000
4Subject: [PATCH] Disable use of syslog for shadow-native tools
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05005
6Disable use of syslog to prevent sysroot user and group additions from
7writing entries to the host's syslog. This patch should only be used
8with the shadow-native recipe.
9
Andrew Geissler9aee5002022-03-30 16:27:02 +000010Upstream-Status: Inappropriate [OE specific configuration]
11Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Patrick Williams03907ee2022-05-01 06:28:52 -050012Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050013
Patrick Williams03907ee2022-05-01 06:28:52 -050014---
15 configure.ac | 2 +-
16 src/login_nopam.c | 3 ++-
17 2 files changed, 3 insertions(+), 2 deletions(-)
18
19diff --git a/configure.ac b/configure.ac
Andrew Geissler517393d2023-01-13 08:55:19 -060020index 924254a..603af81 100644
Patrick Williams03907ee2022-05-01 06:28:52 -050021--- a/configure.ac
22+++ b/configure.ac
Andrew Geissler517393d2023-01-13 08:55:19 -060023@@ -191,7 +191,7 @@ AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$shadow_cv_passwd_dir/passwd",
Andrew Geissler9aee5002022-03-30 16:27:02 +000024 [Path to passwd program.])
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050025
Andrew Geissler9aee5002022-03-30 16:27:02 +000026 dnl XXX - quick hack, should disappear before anyone notices :).
27-AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().])
Patrick Williams03907ee2022-05-01 06:28:52 -050028+#AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().])
Andrew Geissler9aee5002022-03-30 16:27:02 +000029 if test "$ac_cv_func_ruserok" = "yes"; then
30 AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for rlogind.])
31 AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value (0 or 1).])
Patrick Williams03907ee2022-05-01 06:28:52 -050032diff --git a/src/login_nopam.c b/src/login_nopam.c
33index 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