aboutsummaryrefslogtreecommitdiffstats
path: root/main/busybox/0008-login-move-check_securetty-to-libbb.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/busybox/0008-login-move-check_securetty-to-libbb.patch')
-rw-r--r--main/busybox/0008-login-move-check_securetty-to-libbb.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/main/busybox/0008-login-move-check_securetty-to-libbb.patch b/main/busybox/0008-login-move-check_securetty-to-libbb.patch
index c470623a9e..bc3c3a002e 100644
--- a/main/busybox/0008-login-move-check_securetty-to-libbb.patch
+++ b/main/busybox/0008-login-move-check_securetty-to-libbb.patch
@@ -1,7 +1,7 @@
-From 76769ad16cfe28984fe31ec595a7435c8a10d15c Mon Sep 17 00:00:00 2001
+From 49cc996bd0c049c37e98506409c2e3ec30790bf0 Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Thu, 5 Nov 2015 16:27:34 +0200
-Subject: [PATCH 08/15] login: move check_securetty to libbb
+Subject: [PATCH 08/12] login: move check_securetty to libbb
---
include/libbb.h | 1 +
@@ -12,10 +12,10 @@ Subject: [PATCH 08/15] login: move check_securetty to libbb
create mode 100644 libbb/securetty.c
diff --git a/include/libbb.h b/include/libbb.h
-index e39021e..25c5868 100644
+index abdc8c2b8..38d6d0b1e 100644
--- a/include/libbb.h
+++ b/include/libbb.h
-@@ -1374,6 +1374,7 @@ extern void selinux_or_die(void) FAST_FUNC;
+@@ -1390,6 +1390,7 @@ extern void selinux_or_die(void) FAST_FUNC;
#define SETUP_ENV_NO_CHDIR (1 << 4)
void setup_environment(const char *shell, int flags, const struct passwd *pw) FAST_FUNC;
void nuke_str(char *str) FAST_FUNC;
@@ -24,7 +24,7 @@ index e39021e..25c5868 100644
int ask_and_check_password_extended(const struct passwd *pw, int timeout, const char *prompt) FAST_FUNC;
int ask_and_check_password(const struct passwd *pw) FAST_FUNC;
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
-index 52a90e9..ddaa873 100644
+index e426f3c7e..84f3ff477 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -83,6 +83,7 @@ lib-y += safe_gethostname.o
@@ -37,7 +37,7 @@ index 52a90e9..ddaa873 100644
lib-y += simplify_path.o
diff --git a/libbb/securetty.c b/libbb/securetty.c
new file mode 100644
-index 0000000..95edbc9
+index 000000000..95edbc944
--- /dev/null
+++ b/libbb/securetty.c
@@ -0,0 +1,27 @@
@@ -69,7 +69,7 @@ index 0000000..95edbc9
+ALWAYS_INLINE int check_securetty(const char *short_tty UNUSED_PARAM) { return 1; }
+#endif
diff --git a/loginutils/login.c b/loginutils/login.c
-index 94b6c45..9ecf606 100644
+index 52abc1886..30aa63aee 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -173,25 +173,6 @@ static void die_if_nologin(void)
@@ -99,5 +99,5 @@ index 94b6c45..9ecf606 100644
static void initselinux(char *username, char *full_tty,
security_context_t *user_sid)
--
-2.9.1
+2.11.0