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


git-svn-id: svn://busybox.net/trunk/busybox@8126 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 5 insertions, 1 deletions

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