diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-20 15:12:58 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-20 15:12:58 +0000 |
commit | 9230582315a15dd7b95de9f03c48024858ec935d (patch) | |
tree | 5495a94e29baa12c71e33fa8d049131fe572f881 /networking/httpd.c | |
parent | c52248e41ce50bd3fa684d19b2bce4320267dc44 (diff) | |
download | busybox-w32-9230582315a15dd7b95de9f03c48024858ec935d.tar.gz busybox-w32-9230582315a15dd7b95de9f03c48024858ec935d.tar.bz2 busybox-w32-9230582315a15dd7b95de9f03c48024858ec935d.zip |
inetd: use change_identity().
libbb: shrink our internal initgroups().
httpd: remove stray 'else' and 'index_page = "index.html"'
function old new delta
httpd_main 750 743 -7
inetd_main 2033 2011 -22
bb_internal_initgroups 251 228 -23
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-52) Total: -52 bytes
Diffstat (limited to 'networking/httpd.c')
-rw-r--r-- | networking/httpd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index 620e680ac..5e6037cbe 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
@@ -2340,7 +2340,7 @@ int httpd_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
2340 | #if ENABLE_FEATURE_HTTPD_SETUID | 2340 | #if ENABLE_FEATURE_HTTPD_SETUID |
2341 | if (opt & OPT_SETUID) { | 2341 | if (opt & OPT_SETUID) { |
2342 | if (!get_uidgid(&ugid, s_ugid, 1)) | 2342 | if (!get_uidgid(&ugid, s_ugid, 1)) |
2343 | bb_error_msg_and_die("unrecognized user[:group] " | 2343 | bb_error_msg_and_die("unknown user[:group] " |
2344 | "name '%s'", s_ugid); | 2344 | "name '%s'", s_ugid); |
2345 | } | 2345 | } |
2346 | #endif | 2346 | #endif |
@@ -2389,10 +2389,8 @@ int httpd_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
2389 | #if ENABLE_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP | 2389 | #if ENABLE_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP |
2390 | if (!(opt & OPT_INETD)) | 2390 | if (!(opt & OPT_INETD)) |
2391 | sighup_handler(0); | 2391 | sighup_handler(0); |
2392 | else /* do not install HUP handler in inetd mode */ | ||
2393 | #endif | 2392 | #endif |
2394 | index_page = "index.html"; | 2393 | parse_conf(default_path_httpd_conf, FIRST_PARSE); |
2395 | parse_conf(default_path_httpd_conf, FIRST_PARSE); | ||
2396 | 2394 | ||
2397 | xfunc_error_retval = 0; | 2395 | xfunc_error_retval = 0; |
2398 | if (opt & OPT_INETD) | 2396 | if (opt & OPT_INETD) |