diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-12-28 05:44:47 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-12-28 05:44:47 +0000 |
| commit | 9a44c4f91ce7e517d5325fd3743e6ad9d54ef3f0 (patch) | |
| tree | 34292ef12cab59b118e91a6c58844ae25f1bee94 /debianutils | |
| parent | ba092336f00644c1233735bae4b81382309955d8 (diff) | |
| download | busybox-w32-9a44c4f91ce7e517d5325fd3743e6ad9d54ef3f0.tar.gz busybox-w32-9a44c4f91ce7e517d5325fd3743e6ad9d54ef3f0.tar.bz2 busybox-w32-9a44c4f91ce7e517d5325fd3743e6ad9d54ef3f0.zip | |
bb_xget[pw/gr]nam were horribly misnamed - fixed.
uidgid_get -> get_uidgid, add additional param
(numeric_ok). Make chown use it.
chown: fix "chown user: ...."
install: fix incorrect use of bb_xget[pw/gr]nam
Diffstat (limited to 'debianutils')
| -rw-r--r-- | debianutils/start_stop_daemon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c index d1f5e94c0..521b43d04 100644 --- a/debianutils/start_stop_daemon.c +++ b/debianutils/start_stop_daemon.c | |||
| @@ -274,7 +274,7 @@ int start_stop_daemon_main(int argc, char **argv) | |||
| 274 | if (userspec) { | 274 | if (userspec) { |
| 275 | user_id = bb_strtou(userspec, NULL, 10); | 275 | user_id = bb_strtou(userspec, NULL, 10); |
| 276 | if (errno) | 276 | if (errno) |
| 277 | user_id = bb_xgetpwnam(userspec); | 277 | user_id = xuname2uid(userspec); |
| 278 | } | 278 | } |
| 279 | 279 | ||
| 280 | if (opt & CTX_STOP) { | 280 | if (opt & CTX_STOP) { |
| @@ -305,7 +305,7 @@ int start_stop_daemon_main(int argc, char **argv) | |||
| 305 | if (chuid) { | 305 | if (chuid) { |
| 306 | user_id = bb_strtou(chuid, NULL, 10); | 306 | user_id = bb_strtou(chuid, NULL, 10); |
| 307 | if (errno) | 307 | if (errno) |
| 308 | user_id = bb_xgetpwnam(chuid); | 308 | user_id = xuname2uid(chuid); |
| 309 | xsetuid(user_id); | 309 | xsetuid(user_id); |
| 310 | } | 310 | } |
| 311 | #if ENABLE_FEATURE_START_STOP_DAEMON_FANCY | 311 | #if ENABLE_FEATURE_START_STOP_DAEMON_FANCY |