X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=loginutils%2Fvlock.c;h=5ba6a8780d610046148b47e6eb5fe37e4730091a;hb=5b2cc0aaee6985431d9bab1b49ceea7e1fa1d7af;hp=216b317f10b09f957793ff010875ef61e115a256;hpb=0ef64bdb40c54681e8dd5ab8df42ac88e4ab1d4a;p=oweals%2Fbusybox.git

diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index 216b317f1..5ba6a8780 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -13,7 +13,27 @@
  * minimalistic vlock.
  */
 /* 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.
+ */
+//config:config VLOCK
+//config:	bool "vlock"
+//config:	default y
+//config:	help
+//config:	  Build the "vlock" applet which allows you to lock (virtual) terminals.
+//config:
+//config:	  Note that Busybox binary must be setuid root for this applet to
+//config:	  work properly.
+
+//applet:/* Needs to be run by root or be suid root - needs to change uid and gid: */
+//applet:IF_VLOCK(APPLET(vlock, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
+
+//kbuild:lib-$(CONFIG_VLOCK) += vlock.o
+
+//usage:#define vlock_trivial_usage
+//usage:       "[-a]"
+//usage:#define vlock_full_usage "\n\n"
+//usage:       "Lock a virtual terminal. A password is required to unlock.\n"
+//usage:     "\n	-a	Lock all VTs"
 
 #include "libbb.h"
 
@@ -85,24 +105,25 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
 	ioctl(STDIN_FILENO, VT_SETMODE, &vtm);
 #endif
 
+//TODO: use set_termios_to_raw()
 	tcgetattr(STDIN_FILENO, &oterm);
 	term = oterm;
-	term.c_iflag &= ~BRKINT;
-	term.c_iflag |= IGNBRK;
-	term.c_lflag &= ~ISIG;
-	term.c_lflag &= ~(ECHO | ECHOCTL);
+	term.c_iflag |= IGNBRK; /* ignore serial break (why? VTs don't have breaks, right?) */
+	term.c_iflag &= ~BRKINT; /* redundant? "dont translate break to SIGINT" */
+	term.c_lflag &= ~(ISIG | ECHO | ECHOCTL); /* ignore ^C ^Z, echo off */
 	tcsetattr_stdin_TCSANOW(&term);
 
-	do {
+	while (1) {
 		printf("Virtual console%s locked by %s.\n",
-				option_mask32 /*o_lock_all*/ ? "s" : "",
-				pw->pw_name);
-		if (correct_password(pw)) {
+				/* "s" if -a, else "": */ "s" + !option_mask32,
+				pw->pw_name
+		);
+		if (ask_and_check_password(pw) > 0) {
 			break;
 		}
-		bb_do_delay(FAIL_DELAY);
-		puts("Password incorrect");
-	} while (1);
+		bb_do_delay(LOGIN_FAIL_DELAY);
+		puts("Incorrect password");
+	}
 
 #ifdef __linux__
 	ioctl(STDIN_FILENO, VT_SETMODE, &ovtm);