diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-14 00:51:05 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-14 00:51:05 +0000 |
commit | 829bbd3b5701f656c94f1cc672faa39946675d13 (patch) | |
tree | dbe6672228a3cb51eb8031ba714bb4abb96decf4 /loginutils/chpasswd.c | |
parent | f2b39e088d6ccbf4a540c741059c2f661eebc9ac (diff) | |
download | busybox-w32-829bbd3b5701f656c94f1cc672faa39946675d13.tar.gz busybox-w32-829bbd3b5701f656c94f1cc672faa39946675d13.tar.bz2 busybox-w32-829bbd3b5701f656c94f1cc672faa39946675d13.zip |
*: unify concurrent-safe update of /etc/{passwd,group,[g]shadow}
by Tito (farmatito AT tiscali.it)
function old new delta
update_passwd 743 1171 +428
bb_perror_nomsg - 9 +9
find_main 436 444 +8
passwd_main 1023 1027 +4
nameval 202 206 +4
chpasswd_main 315 319 +4
bb__parsespent 119 117 -2
adduser_main 654 650 -4
addgroup_main 345 341 -4
sv_main 1228 1222 -6
deluser_main 173 160 -13
bb_internal_putpwent 69 - -69
add_user_to_group 231 - -231
del_line_matching 460 31 -429
------------------------------------------------------------------------------
(add/remove: 1/2 grow/shrink: 5/6 up/down: 457/-758) Total: -301 bytes
Diffstat (limited to 'loginutils/chpasswd.c')
-rw-r--r-- | loginutils/chpasswd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c index c83d1dad7..4bffbe83f 100644 --- a/loginutils/chpasswd.c +++ b/loginutils/chpasswd.c | |||
@@ -5,7 +5,6 @@ | |||
5 | * Written for SLIND (from passwd.c) by Alexander Shishkin <virtuoso@slind.org> | 5 | * Written for SLIND (from passwd.c) by Alexander Shishkin <virtuoso@slind.org> |
6 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 6 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
7 | */ | 7 | */ |
8 | |||
9 | #include "libbb.h" | 8 | #include "libbb.h" |
10 | 9 | ||
11 | #if ENABLE_GETOPT_LONG | 10 | #if ENABLE_GETOPT_LONG |
@@ -53,10 +52,10 @@ int chpasswd_main(int argc UNUSED_PARAM, char **argv) | |||
53 | /* This is rather complex: if user is not found in /etc/shadow, | 52 | /* This is rather complex: if user is not found in /etc/shadow, |
54 | * we try to find & change his passwd in /etc/passwd */ | 53 | * we try to find & change his passwd in /etc/passwd */ |
55 | #if ENABLE_FEATURE_SHADOWPASSWDS | 54 | #if ENABLE_FEATURE_SHADOWPASSWDS |
56 | rc = update_passwd(bb_path_shadow_file, name, pass); | 55 | rc = update_passwd(bb_path_shadow_file, name, pass, NULL); |
57 | if (rc == 0) /* no lines updated, no errors detected */ | 56 | if (rc == 0) /* no lines updated, no errors detected */ |
58 | #endif | 57 | #endif |
59 | rc = update_passwd(bb_path_passwd_file, name, pass); | 58 | rc = update_passwd(bb_path_passwd_file, name, pass, NULL); |
60 | /* LOGMODE_BOTH logs to syslog also */ | 59 | /* LOGMODE_BOTH logs to syslog also */ |
61 | logmode = LOGMODE_BOTH; | 60 | logmode = LOGMODE_BOTH; |
62 | if (rc < 0) | 61 | if (rc < 0) |