diff options
| author | Ron Yorston | 2020-04-07 10:41:34 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2020-04-30 16:37:44 +0200 |
| commit | d1b75e1842b3e4f61daae2fb8a64d784a553f15c (patch) | |
| tree | a8b5bb5175332f81cd3d9460acfabad4ad3fb9be /networking | |
| parent | 42a8984abc5eed709addac263aab43d64d47257d (diff) | |
| download | busybox-d1b75e1842b3e4f61daae2fb8a64d784a553f15c.zip busybox-d1b75e1842b3e4f61daae2fb8a64d784a553f15c.tar.gz | |
httpd: permit non-default home directory with NOMMU enabled
When BusyBox is compiled with NOMMU enabled running httpd with
the '-h' option fails even if the specified directory exists:
$ ls -d www
www
$ busybox httpd -fvvvp 8080 -h www
...
... try to access http://localhost:8080/www
...
httpd: can't change directory to 'www': No such file or directory
The parent process executes xchdir("www"). When a connection is accepted
it's handled by re-executing httpd in inetd mode. The child process
inherits the current directory "www" and tries to change directory again
to "www", which fails.
Omit the call to xchdir() when httpd is re-executed.
Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/httpd.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index 1757e09..c2d2265 100644 --- a/networking/httpd.c +++ b/networking/httpd.c @@ -2737,7 +2737,12 @@ int httpd_main(int argc UNUSED_PARAM, char **argv) } #endif - xchdir(home_httpd); + /* Chdir to home (unless we were re-execed for NOMMU case: + * we are already in the home dir then). + */ + if (!re_execed) + xchdir(home_httpd); + if (!(opt & OPT_INETD)) { signal(SIGCHLD, SIG_IGN); server_socket = openServer(); |