Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/obscure.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/obscure.c (modified) (4 diffs)

branches/2.2.5/mindi-busybox/libbb/obscure.c

@@ -40 +40 @@
 */
 
-#include <ctype.h>
-#include <unistd.h>
-#include <string.h>
-#include <strings.h>
-
 #include "libbb.h"
-
-
-/* passwords should consist of 6 (to 8 characters) */
-#define MINLEN 6
-
 
 static int string_checker_helper(const char *p1, const char *p2) __attribute__ ((__pure__));
@@ -72 +62 @@
     int ret = string_checker_helper(p1, p2);
     /* Make our own copy */
-    char *p = bb_xstrdup(p1);
+    char *p = xstrdup(p1);
     /* reverse string */
     size = strlen(p);
@@ -101 +91 @@
     int length;
     int mixed = 0;
-    /* Add 1 for each type of characters to the minlen of password */
-    int size = MINLEN + 8;
+    /* Add 2 for each type of characters to the minlen of password */
+    int size = CONFIG_PASSWORD_MINLEN + 8;
     const char *p;
     char hostname[255];
 
     /* size */
-    if (!new_p || (length = strlen(new_p)) < MINLEN)
-        return("too short");
+    if (!new_p || (length = strlen(new_p)) < CONFIG_PASSWORD_MINLEN)
+        return "too short";
 
     /* no username as-is, as sub-string, reversed, capitalized, doubled */
@@ -168 +158 @@
 }
 
-int obscure(const char *old, const char *newval, const struct passwd *pwdp)
+int obscure(const char *old, const char *newval, const struct passwd *pw)
 {
     const char *msg;
 
-    if ((msg = obscure_msg(old, newval, pwdp))) {
-        printf("Bad password: %s.\n", msg);
-        /* If user is root warn only */
-        return (getuid())? 1 : 0;
+    msg = obscure_msg(old, newval, pw);
+    if (msg) {
+        printf("Bad password: %s\n", msg);
+        return 1;
     }
     return 0;