emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

httpd: permit non-default home directory with NOMMU enabled

Browse Source 
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>
This commit is contained in:
Ron Yorston 2020-04-07 10:41:34 +01:00 committed by Denys Vlasenko
parent 42a8984abc
commit d1b75e1842
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
networking/httpd.c
View File

@ -2737,7 +2737,12 @@ int httpd_main(int argc UNUSED_PARAM, char **argv)
} }
#endif #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)) { if (!(opt & OPT_INETD)) {
signal(SIGCHLD, SIG_IGN); signal(SIGCHLD, SIG_IGN);
server_socket = openServer(); server_socket = openServer();