emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: BB_BANNER -> bb_banner (it is not a const or #define)!

Browse Source 
correct_password: explain in detail why it is ok to use bb_banner
fsck_minix: make it print bb version, not it's own (outdated/irrelevant) one

Marginal size difference:
   text    data     bss     dec     hex filename
 679119    2700   15632  697451   aa46b busybox_old
 679091    2700   15632  697423   aa44f busybox_unstripped
This commit is contained in:
Denis Vlasenko
2007-06-13 12:27:17 +00:00
parent b51fd3525e
commit ca525b4f24
12 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libbb/correct_password.c
View File

@@ -47,9 +47,14 @@ int correct_password(const struct passwd *pw)
char buffer[256];
#endif
correct = bb_msg_full_version; /* fake salt. crypt() can choke otherwise */
if (!pw)
goto fake_it; /* The content of 'correct' will never match */
/* fake salt. crypt() can choke otherwise.
* (bb_banner's first two chars are letters and thus are valid salt) */
correct = bb_banner;
if (!pw) {
/* bb_banner will never match, it contains () which is never
* generated in valid encrypted passwords. */
goto fake_it;
}
correct = pw->pw_passwd;
#if ENABLE_FEATURE_SHADOWPASSWDS
if (LONE_CHAR(pw->pw_passwd, 'x') || LONE_CHAR(pw->pw_passwd, '*')) {

3
libbb/messages.c
View File

@@ -12,8 +12,7 @@
#else
#define BANNER "BusyBox v" BB_VER " (" BB_EXTRA_VERSION ")"
#endif
const char BB_BANNER[] = BANNER;
const char bb_msg_full_version[] = BANNER " multi-call binary";
const char bb_banner[] = BANNER;
const char bb_msg_memory_exhausted[] = "memory exhausted";
const char bb_msg_invalid_date[] = "invalid date '%s'";