From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 19 Dec 2003 11:23:47 +0000 (-0000)
Subject: Patch from Stephane Billiart:
X-Git-Tag: 1_00_pre5~23
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=769a3ef08dba4097047ae12ac5c8e05927a20a75;p=oweals%2Fbusybox.git

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
---

diff --git a/networking/httpd.c b/networking/httpd.c
index 1a3f5f94f..a02b63a38 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);