projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
passwd: rework:
[oweals/busybox.git]
/
libbb
/
obscure.c
diff --git
a/libbb/obscure.c
b/libbb/obscure.c
index 3353df949805328490d3bb93e91a0172cf590524..2599095dfca23e0228b3432aadc236d74d12b50f 100644
(file)
--- a/
libbb/obscure.c
+++ b/
libbb/obscure.c
@@
-39,11
+39,6
@@
of crypt do not truncate passwords.
*/
of crypt do not truncate passwords.
*/
-#include <ctype.h>
-#include <unistd.h>
-#include <string.h>
-#include <strings.h>
-
#include "libbb.h"
static int string_checker_helper(const char *p1, const char *p2) __attribute__ ((__pure__));
#include "libbb.h"
static int string_checker_helper(const char *p1, const char *p2) __attribute__ ((__pure__));
@@
-66,7
+61,7
@@
static int string_checker(const char *p1, const char *p2)
/* check string */
int ret = string_checker_helper(p1, p2);
/* Make our own copy */
/* check string */
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);
/* reverse string */
size = strlen(p);
@@
-102,7
+97,7
@@
static const char *obscure_msg(const char *old_p, const char *new_p, const struc
/* size */
if (!new_p || (length = strlen(new_p)) < CONFIG_PASSWORD_MINLEN)
/* size */
if (!new_p || (length = strlen(new_p)) < CONFIG_PASSWORD_MINLEN)
- return
("too short")
;
+ return
"too short"
;
/* no username as-is, as sub-string, reversed, capitalized, doubled */
if (string_checker(new_p, pw->pw_name)) {
/* no username as-is, as sub-string, reversed, capitalized, doubled */
if (string_checker(new_p, pw->pw_name)) {
@@
-162,14
+157,14
@@
static const char *obscure_msg(const char *old_p, const char *new_p, const struc
return NULL;
}
return NULL;
}
-int obscure(const char *old, const char *newval, const struct passwd *pw
dp
)
+int obscure(const char *old, const char *newval, const struct passwd *pw)
{
const char *msg;
{
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;
}
}
return 0;
}