projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename functions to more understandable names
[oweals/busybox.git]
/
libbb
/
obscure.c
diff --git
a/libbb/obscure.c
b/libbb/obscure.c
index 4a8fbf72c742e96ff73d74b044afbc11d60599de..9ac6bcd82ac4b2db2a0891e7d1b282e6d18f84f3 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);
@@
-95,7
+90,7
@@
static const char *obscure_msg(const char *old_p, const char *new_p, const struc
int c;
int length;
int mixed = 0;
int c;
int length;
int mixed = 0;
- /* Add
1
for each type of characters to the minlen of password */
+ /* Add
2
for each type of characters to the minlen of password */
int size = CONFIG_PASSWORD_MINLEN + 8;
const char *p;
char hostname[255];
int size = CONFIG_PASSWORD_MINLEN + 8;
const char *p;
char hostname[255];
@@
-109,7
+104,7
@@
static const char *obscure_msg(const char *old_p, const char *new_p, const struc
return "similar to username";
}
/* no gecos as-is, as sub-string, reversed, capitalized, doubled */
return "similar to username";
}
/* no gecos as-is, as sub-string, reversed, capitalized, doubled */
- if (string_checker(new_p, pw->pw_gecos)) {
+ if (
*pw->pw_gecos &&
string_checker(new_p, pw->pw_gecos)) {
return "similar to gecos";
}
/* hostname as-is, as sub-string, reversed, capitalized, doubled */
return "similar to gecos";
}
/* hostname as-is, as sub-string, reversed, capitalized, doubled */