aboutsummaryrefslogtreecommitdiffstats
path: root/main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch')
-rw-r--r--main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch b/main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch
index 9de531c37e..13c464e4a0 100644
--- a/main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch
+++ b/main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch
@@ -1,7 +1,7 @@
-From 8b337b84dec2765d9fc9a0b2be6341e4bd7e1fcb Mon Sep 17 00:00:00 2001
+From d9c09138d91566af49ef8179d9995c84294e2486 Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Thu, 5 Nov 2015 16:27:36 +0200
-Subject: [PATCH 10/15] su: FEATURE_SU_NULLOK_SECURE
+Subject: [PATCH 10/12] su: FEATURE_SU_NULLOK_SECURE
When this feature is enabled, blank passwords are not accepted by su
unless the user is on a secure TTY defined in /etc/securetty. This
@@ -12,7 +12,7 @@ specify the nullok_secure option for pam_unix.so.
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/loginutils/su.c b/loginutils/su.c
-index 3c0e8c1..bdcc6a9 100644
+index 24ffbde86..086445243 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -24,6 +24,11 @@
@@ -35,7 +35,7 @@ index 3c0e8c1..bdcc6a9 100644
#if ENABLE_FEATURE_UTMP
char user_buf[64];
#endif
-@@ -96,6 +102,12 @@ int su_main(int argc UNUSED_PARAM, char **argv)
+@@ -100,6 +106,12 @@ int su_main(int argc UNUSED_PARAM, char **argv)
argv++;
}
@@ -48,7 +48,7 @@ index 3c0e8c1..bdcc6a9 100644
if (ENABLE_FEATURE_SU_SYSLOG) {
/* The utmp entry (via getlogin) is probably the best way to
* identify the user, especially if someone su's from a su-shell.
-@@ -109,16 +121,12 @@ int su_main(int argc UNUSED_PARAM, char **argv)
+@@ -113,16 +125,12 @@ int su_main(int argc UNUSED_PARAM, char **argv)
pw = getpwuid(cur_uid);
old_user = pw ? xstrdup(pw->pw_name) : "";
}
@@ -67,5 +67,5 @@ index 3c0e8c1..bdcc6a9 100644
syslog(LOG_NOTICE, "%c %s %s:%s",
'+', tty, old_user, opt_username);
--
-2.9.1
+2.11.0