X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source3%2Fweb%2Fcgi.c;h=49a8fa92de4a937da3f44e6bfc344d54856c13c4;hb=d5573ccde3b5c39eb9a4637d5a9d7a95b66d86e3;hp=8e739cd224e7fb513b09cb07ae3f2a1c0db3606d;hpb=2e9e9ff31bd865d4955b7b851a09c2b331f363f8;p=samba.git

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 8e739cd224e..49a8fa92de4 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -114,7 +114,7 @@ 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;
@@ -224,9 +224,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;
 			}
 		}
@@ -301,7 +301,7 @@ static BOOL cgi_handle_authorization(char *line)
 	fstring user, user_pass;
 	struct passwd *pass = NULL;
 
-	if (strncasecmp(line,"Basic ", 6)) {
+	if (!strnequal(line,"Basic ", 6)) {
 		goto err;
 	}
 	line += 6;
@@ -489,22 +489,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) {
+		} else if (strnequal(line,"POST ", 5)) {
 			got_request = True;
 			request_post = 1;
 			url = strdup(&line[5]);
-		} else if (strncasecmp(line,"PUT ", 4)==0) {
+		} 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! */
@@ -578,7 +578,7 @@ return the hostname of the client
 char *cgi_remote_host(void)
 {
 	if (inetd_server) {
-		return get_socket_name(1,False);
+		return get_peer_name(1,False);
 	}
 	return getenv("REMOTE_HOST");
 }
@@ -589,7 +589,7 @@ return the hostname of the client
 char *cgi_remote_addr(void)
 {
 	if (inetd_server) {
-		return get_socket_addr(1);
+		return get_peer_addr(1);
 	}
 	return getenv("REMOTE_ADDR");
 }