aboutsummaryrefslogtreecommitdiff
path: root/libbb/lineedit.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-03-13 13:01:14 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-03-13 13:01:14 +0000
commit5df955fce2fbdc5b2acc365a120327ff943403da (patch)
tree41763239e81807259b7532aeef540ebc4804ce3d /libbb/lineedit.c
parentc9c893d4f59418c50c8eb42bd80390026e123dd8 (diff)
downloadbusybox-w32-5df955fce2fbdc5b2acc365a120327ff943403da.tar.gz
busybox-w32-5df955fce2fbdc5b2acc365a120327ff943403da.tar.bz2
busybox-w32-5df955fce2fbdc5b2acc365a120327ff943403da.zip
Do not fail password check if shadow password does not exist -
fall back to ordinary one Reduced usage of functions returning datain static buffers. (mostly passwd/group/shadow related): function old new delta correct_password 143 193 +50 sulogin_main 490 533 +43 adduser_main 732 774 +42 passwd_main 1875 1915 +40 addgroup_main 330 365 +35 bb_internal_getspnam 38 - -38 bb_internal_fgetpwent 38 - -38 bb_internal_fgetgrent 38 - -38 static.resultbuf 168 88 -80 static.buffer 1872 1104 -768 ------------------------------------------------------------------------------ (add/remove: 0/3 grow/shrink: 5/2 up/down: 210/-962) Total: -752 bytes
Diffstat (limited to 'libbb/lineedit.c')
-rw-r--r--libbb/lineedit.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 16256f726..61b88fdc8 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -342,15 +342,18 @@ static void username_tab_completion(char *ud, char *with_shash_flg)
342 } 342 }
343 } else { 343 } else {
344 /* "~[^/]*" */ 344 /* "~[^/]*" */
345 setpwent(); 345 /* Using _r function to avoid pulling in static buffers */
346 char line_buff[PWD_BUFFER_SIZE];
347 struct passwd pwd;
348 struct passwd *result;
346 349
347 while ((entry = getpwent()) != NULL) { 350 setpwent();
351 while (!getpwent_r(&pwd, line_buff, sizeof(line_buff), &result)) {
348 /* Null usernames should result in all users as possible completions. */ 352 /* Null usernames should result in all users as possible completions. */
349 if ( /*!userlen || */ !strncmp(ud, entry->pw_name, userlen)) { 353 if (/*!userlen || */ strncmp(ud, pwd.pw_name, userlen) == 0) {
350 add_match(xasprintf("~%s/", entry->pw_name)); 354 add_match(xasprintf("~%s/", pwd.pw_name));
351 } 355 }
352 } 356 }
353
354 endpwent(); 357 endpwent();
355 } 358 }
356} 359}