From c03c56b2e29fd773b19b01d22be4ce347be9f05b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 8 Mar 1998 14:52:45 +0000
Subject: - remove redundent strstr()

- don't show printers in shares page
(This used to be commit 2b4204a7769a974a74a7658e787274f6251b1d69)
---
 source3/web/cgi.c  | 5 -----
 source3/web/swat.c | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 83158fc1a5..9ce8c4d91e 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -513,11 +513,6 @@ static void cgi_download(char *file)
 		}
 	}
 
-	if (strstr(file,"..")) {
-		cgi_setup_error("404 File Not Found","",
-				"Relative paths not allowed");
-	}
-
 	if (!file_exist(file, &st)) {
 		cgi_setup_error("404 File Not Found","",
 				"The requested file was not found");
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 6a5b4f51f1..508c8944b4 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -308,7 +308,7 @@ static void shares_page(void)
 		printf("<option value=\" \"> \n");
 	for (i=0;i<lp_numservices();i++) {
 		s = lp_servicename(i);
-		if (s && (*s) && strcmp(s,"IPC$")) {
+		if (s && (*s) && strcmp(s,"IPC$") && !lp_print_ok(i)) {
 			printf("<option %s value=\"%s\">%s\n", 
 			       (share && strcmp(share,s)==0)?"SELECTED":"",
 			       s, s);
-- 
cgit