emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vlock: disable linux console calls on other systems

Browse Source 
Signed-off-by: Jeremie Koenig <jk@jk.fr.eu.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Jeremie Koenig 2010-07-29 04:29:52 +02:00 committed by Denys Vlasenko
parent e7a0632b7b
commit 68fca4cd55
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
loginutils/Config.src
View File

@ -295,7 +295,6 @@ config SULOGIN
config VLOCK config VLOCK
bool "vlock" bool "vlock"
default y default y
depends on PLATFORM_LINUX
select FEATURE_SUID select FEATURE_SUID
help help
Build the "vlock" applet which allows you to lock (virtual) terminals. Build the "vlock" applet which allows you to lock (virtual) terminals.

15
loginutils/vlock.c
View File

@ -15,9 +15,11 @@
/* Fixed by Erik Andersen to do passwords the tinylogin way... /* Fixed by Erik Andersen to do passwords the tinylogin way...
* It now works with md5, sha1, etc passwords. */ * It now works with md5, sha1, etc passwords. */
#include <sys/vt.h>
#include "libbb.h" #include "libbb.h"
#ifdef __linux__
#include <sys/vt.h>
static void release_vt(int signo UNUSED_PARAM) static void release_vt(int signo UNUSED_PARAM)
{ {
/* If -a, param is 0, which means: /* If -a, param is 0, which means:
@ -30,14 +32,17 @@ static void acquire_vt(int signo UNUSED_PARAM)
/* ACK to kernel that switch to console is successful */ /* ACK to kernel that switch to console is successful */
ioctl(STDIN_FILENO, VT_RELDISP, VT_ACKACQ); ioctl(STDIN_FILENO, VT_RELDISP, VT_ACKACQ);
} }
#endif
int vlock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int vlock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int vlock_main(int argc UNUSED_PARAM, char **argv) int vlock_main(int argc UNUSED_PARAM, char **argv)
{ {
#ifdef __linux__
struct vt_mode vtm; struct vt_mode vtm;
struct vt_mode ovtm;
#endif
struct termios term; struct termios term;
struct termios oterm; struct termios oterm;
struct vt_mode ovtm;
struct passwd *pw; struct passwd *pw;
pw = xgetpwuid(getuid()); pw = xgetpwuid(getuid());
@ -55,6 +60,7 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
+ (1 << SIGINT ) + (1 << SIGINT )
, SIG_IGN); , SIG_IGN);
#ifdef __linux__
/* We will use SIGUSRx for console switch control: */ /* We will use SIGUSRx for console switch control: */
/* 1: set handlers */ /* 1: set handlers */
signal_SA_RESTART_empty_mask(SIGUSR1, release_vt); signal_SA_RESTART_empty_mask(SIGUSR1, release_vt);
@ -62,12 +68,14 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
/* 2: unmask them */ /* 2: unmask them */
sig_unblock(SIGUSR1); sig_unblock(SIGUSR1);
sig_unblock(SIGUSR2); sig_unblock(SIGUSR2);
#endif
/* Revert stdin/out to our controlling tty /* Revert stdin/out to our controlling tty
* (or die if we have none) */ * (or die if we have none) */
xmove_fd(xopen(CURRENT_TTY, O_RDWR), STDIN_FILENO); xmove_fd(xopen(CURRENT_TTY, O_RDWR), STDIN_FILENO);
xdup2(STDIN_FILENO, STDOUT_FILENO); xdup2(STDIN_FILENO, STDOUT_FILENO);
#ifdef __linux__
xioctl(STDIN_FILENO, VT_GETMODE, &vtm); xioctl(STDIN_FILENO, VT_GETMODE, &vtm);
ovtm = vtm; ovtm = vtm;
/* "console switches are controlled by us, not kernel!" */ /* "console switches are controlled by us, not kernel!" */
@ -75,6 +83,7 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
vtm.relsig = SIGUSR1; vtm.relsig = SIGUSR1;
vtm.acqsig = SIGUSR2; vtm.acqsig = SIGUSR2;
ioctl(STDIN_FILENO, VT_SETMODE, &vtm); ioctl(STDIN_FILENO, VT_SETMODE, &vtm);
#endif
tcgetattr(STDIN_FILENO, &oterm); tcgetattr(STDIN_FILENO, &oterm);
term = oterm; term = oterm;
@ -95,7 +104,9 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
puts("Password incorrect"); puts("Password incorrect");
} while (1); } while (1);
#ifdef __linux__
ioctl(STDIN_FILENO, VT_SETMODE, &ovtm); ioctl(STDIN_FILENO, VT_SETMODE, &ovtm);
#endif
tcsetattr_stdin_TCSANOW(&oterm); tcsetattr_stdin_TCSANOW(&oterm);
fflush_stdout_and_exit(EXIT_SUCCESS); fflush_stdout_and_exit(EXIT_SUCCESS);
} }