s3-auth: use auth.h where needed.
[samba.git] / source3 / web / cgi.c
index 1cec580c67581a87c0cb21f4f2a50ca1b53dd904..94590a28dee5497824f4d16e7367c21ea596c678 100644 (file)
@@ -1,25 +1,28 @@
 /* 
    some simple CGI helper routines
    Copyright (C) Andrew Tridgell 1997-1998
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "system/passwd.h"
+#include "system/filesys.h"
+#include "web/swat_proto.h"
+#include "intl/lang_tdb.h"
+#include "auth.h"
 
 #define MAX_VARIABLES 10000
 
 extern void print_title(char *fmt, ...);
 #endif
 
-struct var {
+struct cgi_var {
        char *name;
        char *value;
 };
 
-static struct var variables[MAX_VARIABLES];
+static struct cgi_var variables[MAX_VARIABLES];
 static int num_variables;
 static int content_length;
 static int request_post;
@@ -43,45 +46,8 @@ static char *query_string;
 static const char *baseurl;
 static char *pathinfo;
 static char *C_user;
-static BOOL inetd_server;
-static BOOL got_request;
-
-static void unescape(char *buf)
-{
-       char *p=buf;
-
-       while ((p=strchr_m(p,'+')))
-               *p = ' ';
-
-       p = buf;
-
-       while (p && *p && (p=strchr_m(p,'%'))) {
-               int c1 = p[1];
-               int c2 = p[2];
-
-               if (c1 >= '0' && c1 <= '9')
-                       c1 = c1 - '0';
-               else if (c1 >= 'A' && c1 <= 'F')
-                       c1 = 10 + c1 - 'A';
-               else if (c1 >= 'a' && c1 <= 'f')
-                       c1 = 10 + c1 - 'a';
-               else {p++; continue;}
-
-               if (c2 >= '0' && c2 <= '9')
-                       c2 = c2 - '0';
-               else if (c2 >= 'A' && c2 <= 'F')
-                       c2 = 10 + c2 - 'A';
-               else if (c2 >= 'a' && c2 <= 'f')
-                       c2 = 10 + c2 - 'a';
-               else {p++; continue;}
-                       
-               *p = (c1<<4) | c2;
-
-               memmove(p+1, p+3, strlen(p+3)+1);
-               p++;
-       }
-}
-
+static bool inetd_server;
+static bool got_request;
 
 static char *grab_line(FILE *f, int *cl)
 {
@@ -91,16 +57,16 @@ static char *grab_line(FILE *f, int *cl)
 
        while ((*cl)) {
                int c;
-       
+
                if (i == len) {
                        char *ret2;
                        if (len == 0) len = 1024;
                        else len *= 2;
-                       ret2 = (char *)Realloc(ret, len);
+                       ret2 = (char *)SMB_REALLOC_KEEP_OLD_ON_ERROR(ret, len);
                        if (!ret2) return ret;
                        ret = ret2;
                }
-       
+
                c = fgetc(f);
                (*cl)--;
 
@@ -108,7 +74,7 @@ static char *grab_line(FILE *f, int *cl)
                        (*cl) = 0;
                        break;
                }
-               
+
                if (c == '\r') continue;
 
                if (strchr_m("\n&", c)) break;
@@ -116,12 +82,27 @@ static char *grab_line(FILE *f, int *cl)
                ret[i++] = c;
 
        }
-       
 
-       ret[i] = 0;
+       if (ret) {
+               ret[i] = 0;
+       }
        return ret;
 }
 
+/**
+ URL encoded strings can have a '+', which should be replaced with a space
+
+ (This was in rfc1738_unescape(), but that broke the squid helper)
+**/
+
+static void plus_to_space_unescape(char *buf)
+{
+       char *p=buf;
+
+       while ((p=strchr_m(p,'+')))
+               *p = ' ';
+}
+
 /***************************************************************************
   load all the variables passed to the CGI program. May have multiple variables
   with the same name and the same or different values. Takes a file parameter
@@ -151,31 +132,33 @@ void cgi_load_variables(void)
        if (len > 0 && 
            (request_post ||
             ((s=getenv("REQUEST_METHOD")) && 
-             strcasecmp(s,"POST")==0))) {
+             strequal(s,"POST")))) {
                while (len && (line=grab_line(f, &len))) {
                        p = strchr_m(line,'=');
                        if (!p) continue;
-                       
+
                        *p = 0;
-                       
-                       variables[num_variables].name = strdup(line);
-                       variables[num_variables].value = strdup(p+1);
+
+                       variables[num_variables].name = SMB_STRDUP(line);
+                       variables[num_variables].value = SMB_STRDUP(p+1);
 
                        SAFE_FREE(line);
-                       
+
                        if (!variables[num_variables].name || 
                            !variables[num_variables].value)
                                continue;
 
-                       unescape(variables[num_variables].value);
-                       unescape(variables[num_variables].name);
+                       plus_to_space_unescape(variables[num_variables].value);
+                       rfc1738_unescape(variables[num_variables].value);
+                       plus_to_space_unescape(variables[num_variables].name);
+                       rfc1738_unescape(variables[num_variables].name);
 
 #ifdef DEBUG_COMMENTS
                        printf("<!== POST var %s has value \"%s\"  ==>\n",
                               variables[num_variables].name,
                               variables[num_variables].value);
 #endif
-                       
+
                        num_variables++;
                        if (num_variables == MAX_VARIABLES) break;
                }
@@ -185,52 +168,60 @@ void cgi_load_variables(void)
        open("/dev/null", O_RDWR);
 
        if ((s=query_string) || (s=getenv("QUERY_STRING"))) {
-               for (tok=strtok(s,"&;");tok;tok=strtok(NULL,"&;")) {
+               char *saveptr;
+               for (tok=strtok_r(s, "&;", &saveptr); tok;
+                    tok=strtok_r(NULL, "&;", &saveptr)) {
                        p = strchr_m(tok,'=');
                        if (!p) continue;
-                       
+
                        *p = 0;
-                       
-                       variables[num_variables].name = strdup(tok);
-                       variables[num_variables].value = strdup(p+1);
 
-                       if (!variables[num_variables].name || 
+                       variables[num_variables].name = SMB_STRDUP(tok);
+                       variables[num_variables].value = SMB_STRDUP(p+1);
+
+                       if (!variables[num_variables].name ||
                            !variables[num_variables].value)
                                continue;
 
-                       unescape(variables[num_variables].value);
-                       unescape(variables[num_variables].name);
+                       plus_to_space_unescape(variables[num_variables].value);
+                       rfc1738_unescape(variables[num_variables].value);
+                       plus_to_space_unescape(variables[num_variables].name);
+                       rfc1738_unescape(variables[num_variables].name);
 
 #ifdef DEBUG_COMMENTS
                         printf("<!== Commandline var %s has value \"%s\"  ==>\n",
                                variables[num_variables].name,
                                variables[num_variables].value);
-#endif                                         
+#endif
                        num_variables++;
                        if (num_variables == MAX_VARIABLES) break;
                }
 
        }
 #ifdef DEBUG_COMMENTS
-        printf("<!== End dump in cgi_load_variables() ==>\n");   
+        printf("<!== End dump in cgi_load_variables() ==>\n");
 #endif
 
-       /* variables from the client are in display charset - convert them
-          to our internal charset before use */
+       /* variables from the client are in UTF-8 - convert them
+          to our internal unix charset before use */
        for (i=0;i<num_variables;i++) {
-               pstring dest;
-
-               convert_string(CH_DISPLAY, CH_UNIX, 
-                              variables[i].name, -1, 
-                              dest, sizeof(dest));
-               free(variables[i].name);
-               variables[i].name = strdup(dest);
-
-               convert_string(CH_DISPLAY, CH_UNIX, 
-                              variables[i].value, -1,
-                              dest, sizeof(dest));
-               free(variables[i].value);
-               variables[i].value = strdup(dest);
+               TALLOC_CTX *frame = talloc_stackframe();
+               char *dest = NULL;
+               size_t dest_len;
+
+               convert_string_talloc(frame, CH_UTF8, CH_UNIX,
+                              variables[i].name, strlen(variables[i].name),
+                              &dest, &dest_len);
+               SAFE_FREE(variables[i].name);
+               variables[i].name = SMB_STRDUP(dest ? dest : "");
+
+               dest = NULL;
+               convert_string_talloc(frame, CH_UTF8, CH_UNIX,
+                              variables[i].value, strlen(variables[i].value),
+                              &dest, &dest_len);
+               SAFE_FREE(variables[i].value);
+               variables[i].value = SMB_STRDUP(dest ? dest : "");
+               TALLOC_FREE(frame);
        }
 }
 
@@ -238,10 +229,11 @@ void cgi_load_variables(void)
 /***************************************************************************
   find a variable passed via CGI
   Doesn't quite do what you think in the case of POST text variables, because
-  if they exist they might have a value of "" or even " ", depending on the 
+  if they exist they might have a value of "" or even " ", depending on the
   browser. Also doesn't allow for variables[] containing multiple variables
   with the same name and the same or different values.
   ***************************************************************************/
+
 const char *cgi_variable(const char *name)
 {
        int i;
@@ -252,6 +244,20 @@ const char *cgi_variable(const char *name)
        return NULL;
 }
 
+/***************************************************************************
+ Version of the above that can't return a NULL pointer.
+***************************************************************************/
+
+const char *cgi_variable_nonull(const char *name)
+{
+       const char *var = cgi_variable(name);
+       if (var) {
+               return var;
+       } else {
+               return "";
+       }
+}
+
 /***************************************************************************
 tell a browser about a fatal error in the http processing
   ***************************************************************************/
@@ -261,9 +267,9 @@ static void cgi_setup_error(const char *err, const char *header, const char *inf
                /* damn browsers don't like getting cut off before they give a request */
                char line[1024];
                while (fgets(line, sizeof(line)-1, stdin)) {
-                       if (strncasecmp(line,"GET ", 4)==0 || 
-                           strncasecmp(line,"POST ", 5)==0 ||
-                           strncasecmp(line,"PUT ", 4)==0) {
+                       if (strnequal(line,"GET ", 4) || 
+                           strnequal(line,"POST ", 5) ||
+                           strnequal(line,"PUT ", 4)) {
                                break;
                        }
                }
@@ -312,7 +318,7 @@ static void cgi_web_auth(void)
                exit(0);
        }
 
-       pwd = getpwnam_alloc(user);
+       pwd = Get_Pwnam_alloc(talloc_tos(), user);
        if (!pwd) {
                printf("%sCannot find user %s<br>%s\n", head, user, tail);
                exit(0);
@@ -325,55 +331,27 @@ static void cgi_web_auth(void)
                       head, user, (int)geteuid(), (int)getuid(), tail);
                exit(0);
        }
-       passwd_free(&pwd);
+       TALLOC_FREE(pwd);
 }
 
-/***************************************************************************
-decode a base64 string in-place - simple and slow algorithm
-  ***************************************************************************/
-static void base64_decode(char *s)
-{
-       const char *b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-       int bit_offset, byte_offset, idx, i, n;
-       unsigned char *d = (unsigned char *)s;
-       char *p;
-
-       n=i=0;
-
-       while (*s && (p=strchr_m(b64,*s))) {
-               idx = (int)(p - b64);
-               byte_offset = (i*6)/8;
-               bit_offset = (i*6)%8;
-               d[byte_offset] &= ~((1<<(8-bit_offset))-1);
-               if (bit_offset < 3) {
-                       d[byte_offset] |= (idx << (2-bit_offset));
-                       n = byte_offset+1;
-               } else {
-                       d[byte_offset] |= (idx >> (bit_offset-2));
-                       d[byte_offset+1] = 0;
-                       d[byte_offset+1] |= (idx << (8-(bit_offset-2))) & 0xFF;
-                       n = byte_offset+2;
-               }
-               s++; i++;
-       }
-       /* null terminate */
-       d[n] = 0;
-}
 
 /***************************************************************************
 handle a http authentication line
   ***************************************************************************/
-static BOOL cgi_handle_authorization(char *line)
+static bool cgi_handle_authorization(char *line)
 {
-       char *p, *user, *user_pass;
+       char *p;
+       fstring user, user_pass;
        struct passwd *pass = NULL;
+       const char *rhost;
+       char addr[INET6_ADDRSTRLEN];
 
-       if (strncasecmp(line,"Basic ", 6)) {
+       if (!strnequal(line,"Basic ", 6)) {
                goto err;
        }
        line += 6;
        while (line[0] == ' ') line++;
-       base64_decode(line);
+       base64_decode_inplace(line);
        if (!(p=strchr_m(line,':'))) {
                /*
                 * Always give the same error so a cracker
@@ -382,48 +360,60 @@ static BOOL cgi_handle_authorization(char *line)
                goto err;
        }
        *p = 0;
-       user = line;
-       user_pass = p+1;
-       
+
+       convert_string(CH_UTF8, CH_UNIX, 
+                      line, -1, 
+                      user, sizeof(user));
+
+       convert_string(CH_UTF8, CH_UNIX, 
+                      p+1, -1, 
+                      user_pass, sizeof(user_pass));
+
        /*
         * Try and get the user from the UNIX password file.
         */
-       
-       pass = getpwnam_alloc(user);
-       
+
+       pass = Get_Pwnam_alloc(talloc_tos(), user);
+
+       rhost = client_name(1);
+       if (strequal(rhost,"UNKNOWN"))
+               rhost = client_addr(1, addr, sizeof(addr));
+
        /*
         * Validate the password they have given.
         */
-       
-       if NT_STATUS_IS_OK(pass_check(pass, user, user_pass, 
-                     strlen(user_pass), NULL, False)) {
-               
+
+       if NT_STATUS_IS_OK(pass_check(pass, user, rhost, user_pass, false)) {
                if (pass) {
                        /*
                         * Password was ok.
                         */
-                       
+
+                       if ( initgroups(pass->pw_name, pass->pw_gid) != 0 )
+                               goto err;
+
                        become_user_permanently(pass->pw_uid, pass->pw_gid);
-                       
+
                        /* Save the users name */
-                       C_user = strdup(user);
-                       passwd_free(&pass);
+                       C_user = SMB_STRDUP(user);
+                       TALLOC_FREE(pass);
                        return True;
                }
        }
-       
+
 err:
-       cgi_setup_error("401 Bad Authorization", "", 
+       cgi_setup_error("401 Bad Authorization", 
+                       "WWW-Authenticate: Basic realm=\"SWAT\"\r\n",
                        "username or password incorrect");
 
-       passwd_free(&pass);
+       TALLOC_FREE(pass);
        return False;
 }
 
 /***************************************************************************
 is this root?
   ***************************************************************************/
-BOOL am_root(void)
+bool am_root(void)
 {
        if (geteuid() == 0) {
                return( True);
@@ -460,38 +450,65 @@ static void cgi_download(char *file)
                }
        }
 
-       if (!file_exist(file, &st)) {
+       if (sys_stat(file, &st, false) != 0)    {
+               cgi_setup_error("404 File Not Found","",
+                               "The requested file was not found");
+       }
+
+       if (S_ISDIR(st.st_ex_mode))
+       {
+               snprintf(buf, sizeof(buf), "%s/index.html", file);
+               if (!file_exist_stat(buf, &st, false)
+                   || !S_ISREG(st.st_ex_mode))
+               {
+                       cgi_setup_error("404 File Not Found","",
+                                       "The requested file was not found");
+               }
+       }
+       else if (S_ISREG(st.st_ex_mode))
+       {
+               snprintf(buf, sizeof(buf), "%s", file);
+       }
+       else
+       {
                cgi_setup_error("404 File Not Found","",
                                "The requested file was not found");
        }
 
-       fd = web_open(file,O_RDONLY,0);
+       fd = web_open(buf,O_RDONLY,0);
        if (fd == -1) {
                cgi_setup_error("404 File Not Found","",
                                "The requested file was not found");
        }
        printf("HTTP/1.0 200 OK\r\n");
-       if ((p=strrchr_m(file,'.'))) {
+       if ((p=strrchr_m(buf, '.'))) {
                if (strcmp(p,".gif")==0) {
                        printf("Content-Type: image/gif\r\n");
                } else if (strcmp(p,".jpg")==0) {
                        printf("Content-Type: image/jpeg\r\n");
+               } else if (strcmp(p,".png")==0) {
+                       printf("Content-Type: image/png\r\n");
+               } else if (strcmp(p,".css")==0) {
+                       printf("Content-Type: text/css\r\n");
                } else if (strcmp(p,".txt")==0) {
                        printf("Content-Type: text/plain\r\n");
                } else {
                        printf("Content-Type: text/html\r\n");
                }
        }
-       printf("Expires: %s\r\n", http_timestring(time(NULL)+EXPIRY_TIME));
+       printf("Expires: %s\r\n", 
+                  http_timestring(talloc_tos(), time(NULL)+EXPIRY_TIME));
 
        lang = lang_tdb_current();
        if (lang) {
                printf("Content-Language: %s\r\n", lang);
        }
 
-       printf("Content-Length: %d\r\n\r\n", (int)st.st_size);
+       printf("Content-Length: %d\r\n\r\n", (int)st.st_ex_size);
        while ((l=read(fd,buf,sizeof(buf)))>0) {
-               fwrite(buf, 1, l, stdout);
+               if (fwrite(buf, 1, l, stdout) != l) {
+                       break;
+               }
        }
        close(fd);
        exit(0);
@@ -499,6 +516,87 @@ static void cgi_download(char *file)
 
 
 
+/* return true if the char* contains ip addrs only.  Used to avoid
+name lookup calls */
+
+static bool only_ipaddrs_in_list(const char **list)
+{
+       bool only_ip = true;
+
+       if (!list) {
+               return true;
+       }
+
+       for (; *list ; list++) {
+               /* factor out the special strings */
+               if (strequal(*list, "ALL") || strequal(*list, "FAIL") ||
+                   strequal(*list, "EXCEPT")) {
+                       continue;
+               }
+
+               if (!is_ipaddress(*list)) {
+                       /*
+                        * If we failed, make sure that it was not because
+                        * the token was a network/netmask pair. Only
+                        * network/netmask pairs have a '/' in them.
+                        */
+                       if ((strchr_m(*list, '/')) == NULL) {
+                               only_ip = false;
+                               DEBUG(3,("only_ipaddrs_in_list: list has "
+                                       "non-ip address (%s)\n",
+                                       *list));
+                               break;
+                       }
+               }
+       }
+
+       return only_ip;
+}
+
+/* return true if access should be allowed to a service for a socket */
+static bool check_access(int sock, const char **allow_list,
+                        const char **deny_list)
+{
+       bool ret = false;
+       bool only_ip = false;
+       char addr[INET6_ADDRSTRLEN];
+
+       if ((!deny_list || *deny_list==0) && (!allow_list || *allow_list==0)) {
+               return true;
+       }
+
+       /* Bypass name resolution calls if the lists
+        * only contain IP addrs */
+       if (only_ipaddrs_in_list(allow_list) &&
+           only_ipaddrs_in_list(deny_list)) {
+               only_ip = true;
+               DEBUG (3, ("check_access: no hostnames "
+                          "in host allow/deny list.\n"));
+               ret = allow_access(deny_list,
+                                  allow_list,
+                                  "",
+                                  get_peer_addr(sock,addr,sizeof(addr)));
+       } else {
+               DEBUG (3, ("check_access: hostnames in "
+                          "host allow/deny list.\n"));
+               ret = allow_access(deny_list,
+                                  allow_list,
+                                  get_peer_name(sock,true),
+                                  get_peer_addr(sock,addr,sizeof(addr)));
+       }
+
+       if (ret) {
+               DEBUG(2,("Allowed connection from %s (%s)\n",
+                        only_ip ? "" : get_peer_name(sock,true),
+                        get_peer_addr(sock,addr,sizeof(addr))));
+       } else {
+               DEBUG(0,("Denied connection from %s (%s)\n",
+                        only_ip ? "" : get_peer_name(sock,true),
+                        get_peer_addr(sock,addr,sizeof(addr))));
+       }
+
+       return(ret);
+}
 
 /**
  * @brief Setup the CGI framework.
@@ -509,18 +607,18 @@ static void cgi_download(char *file)
  **/
 void cgi_setup(const char *rootdir, int auth_required)
 {
-       BOOL authenticated = False;
+       bool authenticated = False;
        char line[1024];
        char *url=NULL;
        char *p;
        char *lang;
 
        if (chdir(rootdir)) {
-               cgi_setup_error("400 Server Error", "",
+               cgi_setup_error("500 Server Error", "",
                                "chdir failed - the server is not configured correctly");
        }
 
-       /* Handle the possability we might be running as non-root */
+       /* Handle the possibility we might be running as non-root */
        sec_init();
 
        if ((lang=getenv("HTTP_ACCEPT_LANGUAGE"))) {
@@ -539,7 +637,7 @@ void cgi_setup(const char *rootdir, int auth_required)
        inetd_server = True;
 
        if (!check_access(1, lp_hostsallow(-1), lp_hostsdeny(-1))) {
-               cgi_setup_error("400 Server Error", "",
+               cgi_setup_error("403 Forbidden", "",
                                "Samba is configured to deny access from this client\n<br>Check your \"hosts allow\" and \"hosts deny\" options in smb.conf ");
        }
 
@@ -547,22 +645,22 @@ void cgi_setup(const char *rootdir, int auth_required)
           and handle authentication etc */
        while (fgets(line, sizeof(line)-1, stdin)) {
                if (line[0] == '\r' || line[0] == '\n') break;
-               if (strncasecmp(line,"GET ", 4)==0) {
+               if (strnequal(line,"GET ", 4)) {
                        got_request = True;
-                       url = strdup(&line[4]);
-               } else if (strncasecmp(line,"POST ", 5)==0) {
+                       url = SMB_STRDUP(&line[4]);
+               } else if (strnequal(line,"POST ", 5)) {
                        got_request = True;
                        request_post = 1;
-                       url = strdup(&line[5]);
-               } else if (strncasecmp(line,"PUT ", 4)==0) {
+                       url = SMB_STRDUP(&line[5]);
+               } else if (strnequal(line,"PUT ", 4)) {
                        got_request = True;
                        cgi_setup_error("400 Bad Request", "",
                                        "This server does not accept PUT requests");
-               } else if (strncasecmp(line,"Authorization: ", 15)==0) {
+               } else if (strnequal(line,"Authorization: ", 15)) {
                        authenticated = cgi_handle_authorization(&line[15]);
-               } else if (strncasecmp(line,"Content-Length: ", 16)==0) {
+               } else if (strnequal(line,"Content-Length: ", 16)) {
                        content_length = atoi(&line[16]);
-               } else if (strncasecmp(line,"Accept-Language: ", 17)==0) {
+               } else if (strnequal(line,"Accept-Language: ", 17)) {
                        web_set_lang(&line[17]);
                }
                /* ignore all other requests! */
@@ -593,12 +691,12 @@ void cgi_setup(const char *rootdir, int auth_required)
 
        string_sub(url, "/swat/", "", 0);
 
-       if (url[0] != '/' && strstr(url,"..")==0 && file_exist(url, NULL)) {
+       if (url[0] != '/' && strstr(url,"..")==0) {
                cgi_download(url);
        }
 
        printf("HTTP/1.0 200 OK\r\nConnection: close\r\n");
-       printf("Date: %s\r\n", http_timestring(time(NULL)));
+       printf("Date: %s\r\n", http_timestring(talloc_tos(), time(NULL)));
        baseurl = "";
        pathinfo = url+1;
 }
@@ -633,10 +731,10 @@ const char *cgi_pathinfo(void)
 /***************************************************************************
 return the hostname of the client
   ***************************************************************************/
-char *cgi_remote_host(void)
+const char *cgi_remote_host(void)
 {
        if (inetd_server) {
-               return get_socket_name(1,False);
+               return get_peer_name(1,False);
        }
        return getenv("REMOTE_HOST");
 }
@@ -644,10 +742,12 @@ char *cgi_remote_host(void)
 /***************************************************************************
 return the hostname of the client
   ***************************************************************************/
-char *cgi_remote_addr(void)
+const char *cgi_remote_addr(void)
 {
        if (inetd_server) {
-               return get_socket_addr(1);
+               char addr[INET6_ADDRSTRLEN];
+               get_peer_addr(1,addr,sizeof(addr));
+               return talloc_strdup(talloc_tos(), addr);
        }
        return getenv("REMOTE_ADDR");
 }
@@ -656,7 +756,7 @@ char *cgi_remote_addr(void)
 /***************************************************************************
 return True if the request was a POST
   ***************************************************************************/
-BOOL cgi_waspost(void)
+bool cgi_waspost(void)
 {
        if (inetd_server) {
                return request_post;