Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/loginutils/vlock.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/loginutils/vlock.c (modified) (2 diffs)

branches/3.3/mindi-busybox/loginutils/vlock.c

@@ -14 +14 @@
  */
 /* 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
@@ -105 +119 @@
                 pw->pw_name
         );
-        if (correct_password(pw)) {
+        if (ask_and_check_password(pw) > 0) {
             break;
         }