summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2003-12-19 11:23:47 +0000
committerEric Andersen2003-12-19 11:23:47 +0000
commit769a3ef08dba4097047ae12ac5c8e05927a20a75 (patch)
tree043100bd5bfefc2ada3806cf6cd63fe1ad483187
parentf18bd8931d64dcaea6c9c41eb911fff37a38c29f (diff)
downloadbusybox-769a3ef08dba4097047ae12ac5c8e05927a20a75.zip
busybox-769a3ef08dba4097047ae12ac5c8e05927a20a75.tar.gz
Patch from Stephane Billiart:
This removes references to config->remoteuser when CONFIG_FEATURE_HTTPD_CGI=y but CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-rw-r--r--networking/httpd.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/networking/httpd.c b/networking/httpd.c
index 1a3f5f9..a02b63a 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1148,10 +1148,12 @@ static int sendCgi(const char *url,
addEnv("HTTP", "COOKIE", cookie);
if(content_type)
addEnv("CONTENT", "TYPE", content_type);
+#ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH
if(config->remoteuser) {
addEnv("REMOTE", "USER", config->remoteuser);
addEnv("AUTH_TYPE", "", "Basic");
}
+#endif
if(config->referer)
addEnv("HTTP", "REFERER", config->referer);
@@ -1707,8 +1709,10 @@ FORBIDDEN: /* protect listing /cgi-bin */
# ifdef CONFIG_FEATURE_HTTPD_CGI
free(cookie);
free(content_type);
- free(config->remoteuser);
free(config->referer);
+#ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH
+ free(config->remoteuser);
+#endif
# endif
shutdown(a_c_w, SHUT_WR);
shutdown(a_c_r, SHUT_RD);