From 926f4d9125fa76d54e9abeba372ee78e9545182b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 11 Sep 1997 02:17:16 +0000
Subject: cgi.c is a simple set of CGI manipulation routines

wsmbconf.c is a rudimentary web based smb.conf editor. Its really
there just to demonstrate how such an editor can hook into loadparm.c,
I don't expect anyone to actually use it as is.

wsmbstatus.c is a simple web based smbstatus. Its probably broken.
(This used to be commit ced5205f72ba58d677f3cfa480fddc58ec9faa27)
---
 source3/web/cgi.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 163 insertions(+)
 create mode 100644 source3/web/cgi.c

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
new file mode 100644
index 0000000000..56c293985d
--- /dev/null
+++ b/source3/web/cgi.c
@@ -0,0 +1,163 @@
+/* 
+   Unix SMB/Netbios implementation.
+   Version 1.9.
+   some simple CGI helper routines
+   Copyright (C) Andrew Tridgell 1997
+   
+   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
+   (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.
+*/
+
+
+#include "includes.h"
+
+#define MAX_VARIABLES 512
+
+struct var {
+	char *name;
+	char *value;
+};
+
+static struct var variables[MAX_VARIABLES];
+static int num_variables;
+
+
+static int grab_line(int *cl, char *line, int maxsize)
+{
+	int i = 0;
+
+	while ((*cl)) {
+		int c = fgetc(stdin);
+		(*cl)--;
+
+		if (c == EOF) {
+			(*cl) = 0;
+			break;
+		}
+		
+		if (c == '+') {
+			c = ' ';
+		}
+
+		if (c == '\r') continue;
+
+		if (strchr("\n&", c)) break;
+
+		if (c == '%' && (*cl) >= 2) {
+			int c1, c2;
+			c1 = fgetc(stdin);
+			c2 = fgetc(stdin);
+			(*cl) -= 2;
+			if (c1 == EOF || c2 == EOF) break;
+			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 break;
+
+			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 break;
+			
+			c = (c1<<4) | c2;
+		}
+
+		line[i++] = c;
+
+		if (i == maxsize) break;
+	}
+
+	/* now unescape the line */
+	
+
+	line[i] = 0;
+	return 1;
+}
+
+
+/***************************************************************************
+  load all the variables passed to the CGI program
+  ***************************************************************************/
+void cgi_load_variables(void)
+{
+	static pstring line;
+	char *p;	
+	int len;
+
+	if (!(p=getenv("CONTENT_LENGTH"))) return;
+
+	len = atoi(p);
+
+	if (len <= 0) return;
+
+	
+
+	while (len && grab_line(&len, line, sizeof(line)-1)) {		
+		p = strchr(line,'=');
+		if (!p) continue;
+
+		*p = 0;
+
+		variables[num_variables].name = strdup(line);
+		variables[num_variables].value = strdup(p+1);
+		
+		if (!variables[num_variables].name || 
+		    !variables[num_variables].value)
+			continue;
+
+#if 0
+		printf("%s=%s<br>\n", 
+		       variables[num_variables].name,
+		       variables[num_variables].value);
+#endif
+
+		num_variables++;
+		if (num_variables == MAX_VARIABLES) break;
+	}
+
+	fclose(stdin);
+}
+
+
+/***************************************************************************
+  find a variable passed via CGI
+  ***************************************************************************/
+char *cgi_variable(char *name)
+{
+	int i;
+
+	for (i=0;i<num_variables;i++)
+		if (strcmp(variables[i].name, name) == 0)
+			return variables[i].value;
+	return NULL;
+}
+
+
+/***************************************************************************
+  return the value of a CGI boolean variable.
+  ***************************************************************************/
+int cgi_boolean(char *name, int def)
+{
+	char *p = cgi_variable(name);
+
+	if (!p) return def;
+
+	return strcmp(p, "1") == 0;
+}
-- 
cgit 


From 8d971f1db1ba172befc77d5827cb47a18571b88e Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 22 Nov 1997 07:51:23 +0000
Subject: this new cgi code includes the ability to act as a mini web server,
 allowing people to use web configuration of Samba without installing a web
 server (This used to be commit b4e05c360e77cbf27a95920b613bfe6bc874ea1b)

---
 source3/web/cgi.c | 577 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 510 insertions(+), 67 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 56c293985d..3739d712d3 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -1,6 +1,4 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 1.9.
    some simple CGI helper routines
    Copyright (C) Andrew Tridgell 1997
    
@@ -20,9 +18,19 @@
 */
 
 
-#include "includes.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <pwd.h>
 
-#define MAX_VARIABLES 512
+#define MAX_VARIABLES 10000
+
+#ifdef DEBUG_COMMENTS
+extern void print_title(char *fmt, ...);
+#endif
 
 struct var {
 	char *name;
@@ -31,14 +39,60 @@ struct var {
 
 static struct var variables[MAX_VARIABLES];
 static int num_variables;
+static int content_length;
+static int request_post;
+static int request_get;
+static char *query_string;
+
+static void unescape(char *buf)
+{
+	char *p=buf;
+
+	while ((p=strchr(p,'+')))
+		*p = ' ';
+
+	p = buf;
+
+	while (p && *p && (p=strchr(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;
+
+		memcpy(p+1, p+3, strlen(p+3)+1);
+		p++;
+	}
+}
 
 
-static int grab_line(int *cl, char *line, int maxsize)
+static char *grab_line(FILE *f, int *cl)
 {
+	char *ret;
 	int i = 0;
+	int len = 1024;
+
+	ret = (char *)malloc(len);
+	if (!ret) return NULL;
+	
 
 	while ((*cl)) {
-		int c = fgetc(stdin);
+		int c = fgetc(f);
 		(*cl)--;
 
 		if (c == EOF) {
@@ -46,98 +100,140 @@ static int grab_line(int *cl, char *line, int maxsize)
 			break;
 		}
 		
-		if (c == '+') {
-			c = ' ';
-		}
-
 		if (c == '\r') continue;
 
 		if (strchr("\n&", c)) break;
 
-		if (c == '%' && (*cl) >= 2) {
-			int c1, c2;
-			c1 = fgetc(stdin);
-			c2 = fgetc(stdin);
-			(*cl) -= 2;
-			if (c1 == EOF || c2 == EOF) break;
-			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 break;
-
-			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 break;
-			
-			c = (c1<<4) | c2;
-		}
-
-		line[i++] = c;
+		ret[i++] = c;
 
-		if (i == maxsize) break;
+		if (i == len-1) {
+			char *ret2;
+			ret2 = (char *)realloc(ret, len*2);
+			if (!ret2) return ret;
+			len *= 2;
+			ret = ret2;
+		}
 	}
-
-	/* now unescape the line */
 	
 
-	line[i] = 0;
-	return 1;
+	ret[i] = 0;
+	return ret;
 }
 
-
 /***************************************************************************
-  load all the variables passed to the CGI program
+  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
+  for simulating CGI invocation eg loading saved preferences.
   ***************************************************************************/
-void cgi_load_variables(void)
+void cgi_load_variables(FILE *f1)
 {
-	static pstring line;
-	char *p;	
+	FILE *f = f1;
+	static char *line;
+	char *p, *s, *tok;
 	int len;
 
-	if (!(p=getenv("CONTENT_LENGTH"))) return;
+#ifdef DEBUG_COMMENTS
+	char dummy[100]="";
+	print_title(dummy);
+	printf("<!== Start dump in cgi_load_variables() %s ==>\n",__FILE__);
+#endif
 
-	len = atoi(p);
+	if (!f1) {
+		f = stdin;
+		if (!content_length) {
+			p = getenv("CONTENT_LENGTH");
+			len = p?atoi(p):0;
+		} else {
+			len = content_length;
+		}
+	} else {
+		fseek(f, 0, SEEK_END);
+		len = ftell(f);
+		fseek(f, 0, SEEK_SET);
+	}
 
-	if (len <= 0) return;
 
-	
+	if (len > 0 && 
+	    (f1 || request_post ||
+	     ((s=getenv("REQUEST_METHOD")) && 
+	      strcasecmp(s,"POST")==0))) {
+		while (len && (line=grab_line(f, &len))) {
+			p = strchr(line,'=');
+			if (!p) continue;
+			
+			*p = 0;
+			
+			variables[num_variables].name = strdup(line);
+			variables[num_variables].value = strdup(p+1);
 
-	while (len && grab_line(&len, line, sizeof(line)-1)) {		
-		p = strchr(line,'=');
-		if (!p) continue;
+			free(line);
+			
+			if (!variables[num_variables].name || 
+			    !variables[num_variables].value)
+				continue;
 
-		*p = 0;
+			unescape(variables[num_variables].value);
+			unescape(variables[num_variables].name);
 
-		variables[num_variables].name = strdup(line);
-		variables[num_variables].value = strdup(p+1);
-		
-		if (!variables[num_variables].name || 
-		    !variables[num_variables].value)
-			continue;
-
-#if 0
-		printf("%s=%s<br>\n", 
-		       variables[num_variables].name,
-		       variables[num_variables].value);
+#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;
+		}
+	}
 
-		num_variables++;
-		if (num_variables == MAX_VARIABLES) break;
+	if (f1) {
+#ifdef DEBUG_COMMENTS
+	        printf("<!== End dump in cgi_load_variables() ==>\n"); 
+#endif
+		return;
 	}
 
 	fclose(stdin);
+
+	if ((s=query_string) || (s=getenv("QUERY_STRING"))) {
+		for (tok=strtok(s,"&;");tok;tok=strtok(NULL,"&;")) {
+			p = strchr(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].value)
+				continue;
+
+			unescape(variables[num_variables].value);
+			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						
+			num_variables++;
+			if (num_variables == MAX_VARIABLES) break;
+		}
+
+	}
+#ifdef DEBUG_COMMENTS
+        printf("<!== End dump in cgi_load_variables() ==>\n");   
+#endif
 }
 
 
 /***************************************************************************
   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 
+  browser. Also doesn't allow for variables[] containing multiple variables
+  with the same name and the same or different values.
   ***************************************************************************/
 char *cgi_variable(char *name)
 {
@@ -149,6 +245,15 @@ char *cgi_variable(char *name)
 	return NULL;
 }
 
+/***************************************************************************
+return a particular cgi variable
+  ***************************************************************************/
+char *cgi_vnum(int i, char **name)
+{
+	if (i < 0 || i >= num_variables) return NULL;
+	*name = variables[i].name;
+	return variables[i].value;
+}
 
 /***************************************************************************
   return the value of a CGI boolean variable.
@@ -161,3 +266,341 @@ int cgi_boolean(char *name, int def)
 
 	return strcmp(p, "1") == 0;
 }
+
+/***************************************************************************
+like strdup() but quotes < > and &
+  ***************************************************************************/
+char *quotedup(char *s)
+{
+	int i, n=0;
+	int len;
+	char *ret;
+	char *d;
+
+	if (!s) return strdup("");
+
+	len = strlen(s);
+
+	for (i=0;i<len;i++)
+		if (s[i] == '<' || s[i] == '>' || s[i] == '&')
+			n++;
+
+	ret = malloc(len + n*6 + 1);
+
+	if (!ret) return NULL;
+
+	d = ret;
+
+	for (i=0;i<len;i++) {
+		switch (s[i]) {
+		case '<':
+			strcpy(d, "&lt;");
+			d += 4;
+			break;
+
+		case '>':
+			strcpy(d, "&gt;");
+			d += 4;
+			break;
+
+		case '&':
+			strcpy(d, "&amp;");
+			d += 5;
+			break;
+
+		default:
+			*d++ = s[i];
+		}
+	}
+
+	*d = 0;
+
+	return ret;
+}
+
+
+/***************************************************************************
+like strdup() but quotes a wide range of characters
+  ***************************************************************************/
+char *urlquote(char *s)
+{
+	int i, n=0;
+	int len;
+	char *ret;
+	char *d;
+	char *qlist = "\"\n\r'&<> \t+;";
+
+	if (!s) return strdup("");
+
+	len = strlen(s);
+
+	for (i=0;i<len;i++)
+		if (strchr(qlist, s[i])) n++;
+
+	ret = malloc(len + n*2 + 1);
+
+	if (!ret) return NULL;
+
+	d = ret;
+
+	for (i=0;i<len;i++) {
+		if (strchr(qlist,s[i])) {
+			sprintf(d, "%%%02X", (int)s[i]);
+			d += 3;
+		} else {
+			*d++ = s[i];
+		}
+	}
+
+	*d = 0;
+
+	return ret;
+}
+
+
+/***************************************************************************
+like strdup() but quotes " characters
+  ***************************************************************************/
+char *quotequotes(char *s)
+{
+	int i, n=0;
+	int len;
+	char *ret;
+	char *d;
+
+	if (!s) return strdup("");
+
+	len = strlen(s);
+
+	for (i=0;i<len;i++)
+		if (s[i] == '"')
+			n++;
+
+	ret = malloc(len + n*6 + 1);
+
+	if (!ret) return NULL;
+
+	d = ret;
+
+	for (i=0;i<len;i++) {
+		switch (s[i]) {
+		case '"':
+			strcpy(d, "&quot;");
+			d += 6;
+			break;
+
+		default:
+			*d++ = s[i];
+		}
+	}
+
+	*d = 0;
+
+	return ret;
+}
+
+
+/***************************************************************************
+quote spaces in a buffer
+  ***************************************************************************/
+void quote_spaces(char *buf)
+{
+	while (*buf) {
+		if (*buf == ' ') *buf = '+';
+		buf++;
+	}
+}
+
+
+
+/***************************************************************************
+tell a browser about a fatal error in the http processing
+  ***************************************************************************/
+static void cgi_setup_error(char *err, char *header, char *info)
+{
+	printf("HTTP/1.1 %s\r\n%sConnection: close\r\nContent-Type: text/html\r\n\r\n<HTML><HEAD><TITLE>%s</TITLE></HEAD><BODY><H1>%s</H1>%s<p></BODY></HTML>\r\n", err, header, err, err, info);
+	exit(0);
+}
+
+
+/***************************************************************************
+decode a base64 string in-place - simple and slow algorithm
+  ***************************************************************************/
+static void base64_decode(char *s)
+{
+	char *b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	int bit_offset, byte_offset, idx, i;
+	unsigned char *d = (unsigned char *)s;
+	char *p;
+
+	i=0;
+
+	while (*s && (p=strchr(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));
+		} else {
+			d[byte_offset] |= (idx >> (bit_offset-2));
+			d[byte_offset+1] = 0;
+			d[byte_offset+1] |= (idx << (8-(bit_offset-2))) & 0xFF;
+		}
+		s++; i++;
+	}
+}
+
+
+/***************************************************************************
+handle a http authentication line
+  ***************************************************************************/
+static int cgi_handle_authorization(char *line)
+{
+	char *p, *user, *pass;
+	struct passwd *pwd;
+	int ret=0;
+
+	if (strncasecmp(line,"Basic ", 6)) {
+		cgi_setup_error("401 Bad Authorization", "", 
+				"Only basic authorization is understood");
+	}
+	line += 6;
+	while (line[0] == ' ') line++;
+	base64_decode(line);
+	if (!(p=strchr(line,':'))) {
+		cgi_setup_error("401 Bad Authorization", "", 
+				"username/password must be supplied");
+	}
+	*p = 0;
+	user = line;
+	pass = p+1;
+
+	/* currently only allow connections as root */
+	if (strcasecmp(user,"root")) {
+		cgi_setup_error("401 Bad Authorization", "", 
+				"incorrect username/password");
+	}
+	
+	pwd = getpwnam(user);
+
+	if (!strcmp((char *)crypt(pass, pwd->pw_passwd),pwd->pw_passwd)) {
+		ret = 1;
+	}
+
+	memset(pass, 0, strlen(pass));
+
+	return ret;
+}
+
+
+/***************************************************************************
+handle a file download
+  ***************************************************************************/
+static void cgi_download(char *file)
+{
+	struct stat st;
+	char buf[1024];
+	int fd, l;
+	char *p;
+
+	if (!file_exist(file, &st)) {
+		cgi_setup_error("404 File Not Found","",
+				"The requested file was not found");
+	}
+	fd = open(file,O_RDONLY);
+	if (fd == -1) {
+		cgi_setup_error("404 File Not Found","",
+				"The requested file was not found");
+	}
+	printf("HTTP/1.1 200 OK\r\n");
+	if ((p=strrchr(file,'.'))) {
+		if (strcmp(p,".gif")==0 || strcmp(p,".jpg")==0) {
+			printf("Content-Type: image/gif\r\n");
+		} else {
+			printf("Content-Type: text/html\r\n");
+		}
+	}
+	printf("Content-Length: %d\r\n\r\n", (int)st.st_size);
+	while ((l=read(fd,buf,sizeof(buf)))>0) {
+		fwrite(buf, 1, l, stdout);
+	}
+	close(fd);
+	exit(0);
+}
+
+
+/***************************************************************************
+setup the cgi framework, handling the possability that this program is either
+run as a true cgi program by a web browser or is itself a mini web server
+  ***************************************************************************/
+void cgi_setup(char *rootdir)
+{
+	int authenticated = 0;
+	char line[1024];
+	char *url=NULL;
+	char *p;
+
+	if (chdir(rootdir)) {
+		cgi_setup_error("400 Server Error", "",
+				"chdir failed - the server is not configured correctly");
+	}
+
+	if (getenv("CONTENT_LENGTH") || getenv("REQUEST_METHOD")) {
+		/* assume we are running under a real web server */
+		return;
+	}
+
+	/* we are a mini-web server. We need to read the request from stdin
+	   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) {
+			request_get = 1;
+			url = strdup(&line[4]);
+		} else if (strncasecmp(line,"POST ", 5)==0) {
+			request_post = 1;
+			url = strdup(&line[5]);
+		} else if (strncasecmp(line,"PUT ", 4)==0) {
+			cgi_setup_error("400 Bad Request", "",
+					"This server does not accept PUT requests");
+		} else if (strncasecmp(line,"Authorization: ", 15)==0) {
+			authenticated = cgi_handle_authorization(&line[15]);
+		} else if (strncasecmp(line,"Content-Length: ", 16)==0) {
+			content_length = atoi(&line[16]);
+		}
+		/* ignore all other requests! */
+	}
+
+	if (!authenticated) {
+		cgi_setup_error("401 Authorization Required", 
+				"WWW-Authenticate: Basic realm=\"samba\"\r\n",
+				"You must be authenticated to use this service");
+	}
+
+	if (!url) {
+		cgi_setup_error("400 Bad Request", "",
+				"You must specify a GET or POST request");
+	}
+
+	/* trim the URL */
+	if ((p = strchr(url,' ')) || (p=strchr(url,'\t'))) {
+		*p = 0;
+	}
+	while (*url && strchr("\r\n",url[strlen(url)-1])) {
+		url[strlen(url)-1] = 0;
+	}
+
+	/* anything following a ? in the URL is part of the query string */
+	if ((p=strchr(url,'?'))) {
+		query_string = p+1;
+		*p = 0;
+	}
+
+	if (strcmp(url,"/")) {
+		cgi_download(url+1);
+	}
+
+	printf("HTTP/1.1 200 OK\r\nConnection: close\r\nContent-Type: text/html\r\n\r\n");
+	
+}
-- 
cgit 


From 74f06e4062634fa4f8cb46915280dedf73d58c6f Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 23 Nov 1997 02:42:22 +0000
Subject: minor wsmbconf and cgi changes (This used to be commit
 bca9c49e6f24c2ee79cbb9b6ebf69d6647146fc1)

---
 source3/web/cgi.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 3739d712d3..f165c56110 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -501,9 +501,22 @@ static void cgi_download(char *file)
 {
 	struct stat st;
 	char buf[1024];
-	int fd, l;
+	int fd, l, i;
 	char *p;
 
+	/* sanitise the filename */
+	for (i=0;file[i];i++) {
+		if (!isalnum(file[i]) && !strchr("/.-_", file[i])) {
+			cgi_setup_error("404 File Not Found","",
+					"Illegal character in filename");
+		}
+	}
+
+	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");
@@ -574,7 +587,7 @@ void cgi_setup(char *rootdir)
 
 	if (!authenticated) {
 		cgi_setup_error("401 Authorization Required", 
-				"WWW-Authenticate: Basic realm=\"samba\"\r\n",
+				"WWW-Authenticate: Basic realm=\"root\"\r\n",
 				"You must be authenticated to use this service");
 	}
 
@@ -604,3 +617,5 @@ void cgi_setup(char *rootdir)
 	printf("HTTP/1.1 200 OK\r\nConnection: close\r\nContent-Type: text/html\r\n\r\n");
 	
 }
+
+
-- 
cgit 


From 96eed00608226370ca4177fd9c8a4ae54d17517d Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 12 Jan 1998 00:32:27 +0000
Subject: propogate my cgi changes to the main branch (This used to be commit
 215c97e83ac74757cffb4f64176c80ddb845d65f)

---
 source3/web/cgi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index f165c56110..e697f5537a 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -614,7 +614,7 @@ void cgi_setup(char *rootdir)
 		cgi_download(url+1);
 	}
 
-	printf("HTTP/1.1 200 OK\r\nConnection: close\r\nContent-Type: text/html\r\n\r\n");
+	printf("HTTP/1.1 200 OK\r\nConnection: close\r\n");
 	
 }
 
-- 
cgit 


From 55f400bd84f26027f5ec9b7fa06b22895de7557c Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 22 Jan 1998 13:27:43 +0000
Subject: This is *not* a big change (although it looks like one). This is
 merely updating the Copyright statements from 1997 to 1998. It's a once a
 year thing :-). NO OTHER CHANGES WERE MADE. Jeremy. (This used to be commit
 b9c16977231efb274e08856f7f3f4408dad6d96c)

---
 source3/web/cgi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index e697f5537a..ae60d72b7b 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -1,6 +1,6 @@
 /* 
    some simple CGI helper routines
-   Copyright (C) Andrew Tridgell 1997
+   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
-- 
cgit 


From 35d67dd80aa3ba72b75683cb1f35c81066e21223 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 8 Mar 1998 14:14:49 +0000
Subject: Jeremy is going to hate me ...

These are some hacks on SWAT. Maybe users will actually be able to
work out how to use it now.

Unfortunately these changes required some editing in loadparm.c and
smb.h which will make Jeremys merge job harder. Sorry!
(This used to be commit 674c88a6bf4c8009769a482c53f105efdc54bbc8)
---
 source3/web/cgi.c  |  13 +-
 source3/web/swat.c | 483 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 494 insertions(+), 2 deletions(-)
 create mode 100644 source3/web/swat.c

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index ae60d72b7b..7c84f47ada 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -43,6 +43,7 @@ static int content_length;
 static int request_post;
 static int request_get;
 static char *query_string;
+static char *baseurl;
 
 static void unescape(char *buf)
 {
@@ -610,12 +611,20 @@ void cgi_setup(char *rootdir)
 		*p = 0;
 	}
 
-	if (strcmp(url,"/")) {
+	if (strstr(url+1,"..")==0 && file_exist(url+1)) {
 		cgi_download(url+1);
 	}
 
 	printf("HTTP/1.1 200 OK\r\nConnection: close\r\n");
-	
+
+	baseurl = url+1;
 }
 
 
+/***************************************************************************
+return the current pages URL
+  ***************************************************************************/
+char *cgi_baseurl(void)
+{
+	return baseurl;
+}
diff --git a/source3/web/swat.c b/source3/web/swat.c
new file mode 100644
index 0000000000..4810d87af3
--- /dev/null
+++ b/source3/web/swat.c
@@ -0,0 +1,483 @@
+/* 
+   Unix SMB/Netbios implementation.
+   Version 1.9.
+   html smb.conf editing - prototype only
+   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
+   (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.
+*/
+
+#ifdef SYSLOG
+#undef SYSLOG
+#endif
+
+#include "includes.h"
+#include "smb.h"
+
+#define GLOBALS_SNUM -2
+#define DEFAULTS_SNUM -1
+
+static pstring servicesf = CONFIGFILE;
+
+
+/* start the page with standard stuff */
+static void print_header(void)
+{
+	printf("Content-type: text/html\r\n\r\n");
+	printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
+	printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY>\n\n");
+}
+
+
+/* finish off the page */
+static void print_footer(void)
+{
+	printf("\n</BODY>\n</HTML>\n");
+}
+
+/* include a lump of html in a page */
+static void include_html(char *fname)
+{
+	FILE *f = fopen(fname,"r");
+	char buf[1024];
+	int ret;
+
+	if (!f) {
+		printf("ERROR: Can't open %s\n", fname);
+		return;
+	}
+
+	while (!feof(f)) {
+		ret = fread(buf, 1, sizeof(buf), f);
+		if (ret <= 0) break;
+		fwrite(buf, 1, ret, stdout);
+	}
+
+	fclose(f);
+}
+
+
+/* display one editable parameter */
+static void show_parameter(int snum, struct parm_struct *parm)
+{
+	int i;
+	void *ptr = parm->ptr;
+
+	if (parm->class == P_LOCAL) {
+		ptr = lp_local_ptr(snum, ptr);
+	}
+
+	printf("<tr><td><A HREF=\"help/parameters.html#%s\">?</A> %s</td><td>", 
+	       parm->label, parm->label);
+
+	switch (parm->type) {
+	case P_CHAR:
+		printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",
+		       parm->label, *(char *)ptr);
+		break;
+
+	case P_STRING:
+	case P_USTRING:
+		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
+		       parm->label, *(char **)ptr);
+		break;
+
+	case P_GSTRING:
+	case P_UGSTRING:
+		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
+		       parm->label, (char *)ptr);
+		break;
+
+	case P_BOOL:
+		printf("<input type=radio name=\"parm_%s\" value=Yes %s>yes&nbsp;&nbsp;", parm->label, (*(BOOL *)ptr)?"CHECKED":"");
+		printf("<input type=radio name=\"parm_%s\" value=No %s>no", parm->label, (*(BOOL *)ptr)?"":"CHECKED");
+		break;
+
+	case P_BOOLREV:
+		printf("<input type=radio name=\"parm_%s\" value=Yes %s>yes&nbsp;&nbsp;", parm->label, (*(BOOL *)ptr)?"":"CHECKED");
+		printf("<input type=radio name=\"parm_%s\" value=No %s>no", parm->label, (*(BOOL *)ptr)?"CHECKED":"");
+		break;
+
+	case P_INTEGER:
+		printf("<input type=text size=8 name=\"parm_%s\" value=%d>", parm->label, *(int *)ptr);
+		break;
+
+	case P_OCTAL:
+		printf("<input type=text size=8 name=\"parm_%s\" value=0%o>", parm->label, *(int *)ptr);
+		break;
+
+	case P_ENUM:
+		for (i=0;parm->enum_list[i].name;i++)
+			printf("<input type=radio name=\"parm_%s\" value=%s %s>%s&nbsp;&nbsp;", 
+			       parm->label, parm->enum_list[i].name, 
+			       (*(int *)ptr)==parm->enum_list[i].value?"CHECKED":"", 
+			       parm->enum_list[i].name);
+		break;
+			
+	}
+	printf("</td></tr>\n");
+}
+
+/* display a set of parameters for a service */
+static void show_parameters(int snum, int allparameters, int advanced, int printers)
+{
+	int i = 0;
+	struct parm_struct *parm;
+
+	printf("<table>\n");
+
+	while ((parm = lp_next_parameter(snum, &i, allparameters))) {
+		if (parm->flags & FLAG_HIDE) continue;
+		if (!advanced) {
+			if (!printers && !(parm->flags & FLAG_BASIC)) continue;
+			if (printers && !(parm->flags & FLAG_PRINT)) continue;
+		}
+		show_parameter(snum, parm);
+	}
+	printf("</table>\n");
+}
+
+
+static int save_reload(void)
+{
+	FILE *f;
+
+	f = fopen(servicesf,"w");
+	if (!f) {
+		printf("failed to open %s for writing\n", servicesf);
+		return 0;
+	}
+
+	fprintf(f, "# Samba config file created using SWAT\n");
+
+	lp_dump(f);
+
+	fclose(f);
+
+	lp_killunused(NULL);
+
+	if (!lp_load(servicesf,False)) {
+                printf("Can't reload %s\n", servicesf);
+                return 0;
+        }
+
+	return 1;
+}
+
+
+
+/* commit a set of parameters for a service */
+static void commit_parameters(int snum)
+{
+	int i = 0;
+	struct parm_struct *parm;
+	pstring label;
+	char *v;
+
+	while ((parm = lp_next_parameter(snum, &i, 1))) {
+		sprintf(label, "parm_%s", parm->label);
+		if ((v = cgi_variable(label))) {
+			lp_do_parameter(snum, parm->label, v); 
+		}
+	}
+
+	save_reload();
+}
+
+
+/* load the smb.conf file into loadparm. */
+static void load_config(void)
+{
+	if (!lp_load(servicesf,False)) {
+		printf("<b>Can't load %s - using defaults</b><p>\n", 
+		       servicesf);
+	}
+}
+
+/* spit out the html for a link with an image */
+static void image_link(char *name,char *hlink, char *src, int width, int height)
+{
+	printf("<A HREF=\"%s\"><img width=%d height=%d src=\"%s\" alt=\"%s\"></A>\n", hlink, width, height, src, name);
+}
+
+/* display the main navigation controls at the top of each page along
+   with a title */
+static void show_main_buttons(void)
+{
+	printf("<H2 align=center>Samba Web Administration Tool</H2>\n");
+
+	image_link("Globals", "globals", "images/globals.gif", 50, 50);
+	image_link("Shares", "shares", "images/shares.gif", 50, 50);
+	image_link("Printers", "printers", "images/printers.gif", 50, 50);
+
+	printf("<HR>\n");
+}
+
+/* display a welcome page  */
+static void welcome_page(void)
+{
+	include_html("help/welcome.html");
+}
+
+
+/* display a globals editing page  */
+static void globals_page(void)
+{
+	int advanced = 0;
+
+	printf("<H2>Global Variables</H2>\n");
+
+	if (cgi_variable("Advanced") && !cgi_variable("Basic"))
+		advanced = 1;
+
+	if (cgi_variable("Commit")) {
+		commit_parameters(GLOBALS_SNUM);
+	}
+
+	printf("<FORM method=post>\n");
+
+	printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+	if (advanced == 0) {
+		printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
+	} else {
+		printf("<input type=submit name=\"Basic\" value=\"Basic View\">\n");
+	}
+	printf("<p>\n");
+	
+	show_parameters(GLOBALS_SNUM, 1, advanced, 0);
+
+	if (advanced) {
+		printf("<input type=hidden name=\"Advanced\" value=1>\n");
+	}
+
+	printf("</form>\n");
+}
+
+/* display a shares editing page  */
+static void shares_page(void)
+{
+	char *share = cgi_variable("share");
+	char *s;
+	int snum=-1;
+	int i;
+	int advanced = 0;
+
+	if (share)
+		snum = lp_servicenumber(share);
+
+	printf("<H2>Share Parameters</H2>\n");
+
+	if (cgi_variable("Advanced") && !cgi_variable("Basic"))
+		advanced = 1;
+
+	if (cgi_variable("Commit") && snum >= 0) {
+		commit_parameters(snum);
+	}
+
+	if (cgi_variable("Delete") && snum >= 0) {
+		lp_remove_service(snum);
+		save_reload();
+		share = NULL;
+		snum = -1;
+	}
+
+	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
+		lp_copy_service(DEFAULTS_SNUM, share);
+		save_reload();
+		snum = lp_servicenumber(share);
+	}
+
+	printf("<FORM method=post>\n");
+
+	printf("<table>\n");
+	printf("<tr><td><input type=submit name=selectshare value=\"Choose Share\"></td>\n");
+	printf("<td><select name=share>\n");
+	if (snum < 0)
+		printf("<option value=\" \"> \n");
+	for (i=0;i<lp_numservices();i++) {
+		s = lp_servicename(i);
+		if (s && (*s) && strcmp(s,"IPC$")) {
+			printf("<option %s value=\"%s\">%s\n", 
+			       (share && strcmp(share,s)==0)?"SELECTED":"",
+			       s, s);
+		}
+	}
+	printf("</select></td></tr><p>");
+
+	printf("<tr><td><input type=submit name=createshare value=\"Create Share\"></td>\n");
+	printf("<td><input type=text size=30 name=newshare></td></tr>\n");
+	printf("</table>");
+
+
+	if (snum >= 0) {
+		printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+		printf("<input type=submit name=\"Delete\" value=\"Delete Share\">\n");
+		if (advanced == 0) {
+			printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
+		} else {
+			printf("<input type=submit name=\"Basic\" value=\"Basic View\">\n");
+		}
+		printf("<p>\n");
+	}
+
+	if (snum >= 0) {
+		show_parameters(snum, 1, advanced, 0);
+	}
+
+	if (advanced) {
+		printf("<input type=hidden name=\"Advanced\" value=1>\n");
+	}
+
+	printf("</FORM>\n");
+}
+
+
+/* display a printers editing page  */
+static void printers_page(void)
+{
+	char *share = cgi_variable("share");
+	char *s;
+	int snum=-1;
+	int i;
+	int advanced = 0;
+
+	if (share)
+		snum = lp_servicenumber(share);
+
+	printf("<H2>Printer Parameters</H2>\n");
+
+	if (cgi_variable("Advanced") && !cgi_variable("Basic"))
+		advanced = 1;
+
+	if (cgi_variable("Commit") && snum >= 0) {
+		commit_parameters(snum);
+	}
+
+	if (cgi_variable("Delete") && snum >= 0) {
+		lp_remove_service(snum);
+		save_reload();
+		share = NULL;
+		snum = -1;
+	}
+
+	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
+		lp_copy_service(DEFAULTS_SNUM, share);
+		snum = lp_servicenumber(share);
+		lp_do_parameter(snum, "print ok", "Yes");
+		save_reload();
+		snum = lp_servicenumber(share);
+	}
+
+	printf("<FORM method=post>\n");
+
+	printf("<table>\n");
+	printf("<tr><td><input type=submit name=selectshare value=\"Choose Printer\"></td>\n");
+	printf("<td><select name=share>\n");
+	if (snum < 0 || !lp_print_ok(snum))
+		printf("<option value=\" \"> \n");
+	for (i=0;i<lp_numservices();i++) {
+		s = lp_servicename(i);
+		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);
+		}
+	}
+	printf("</select></td></tr><p>");
+
+	printf("<tr><td><input type=submit name=createshare value=\"Create Printer\"></td>\n");
+	printf("<td><input type=text size=30 name=newshare></td></tr>\n");
+	printf("</table>");
+
+
+	if (snum >= 0) {
+		printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+		printf("<input type=submit name=\"Delete\" value=\"Delete Printer\">\n");
+		if (advanced == 0) {
+			printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
+		} else {
+			printf("<input type=submit name=\"Basic\" value=\"Basic View\">\n");
+		}
+		printf("<p>\n");
+	}
+
+	if (snum >= 0) {
+		show_parameters(snum, 1, advanced, 1);
+	}
+
+	if (advanced) {
+		printf("<input type=hidden name=\"Advanced\" value=1>\n");
+	}
+
+	printf("</FORM>\n");
+}
+
+
+int main(int argc, char *argv[])
+{
+	extern char *optarg;
+	extern int optind;
+	extern FILE *dbf;
+	int opt;
+	char *page;
+
+	/* just in case it goes wild ... */
+	alarm(300);
+
+	dbf = fopen("/dev/null", "w");
+
+	if (!dbf) dbf = stderr;
+
+	cgi_setup(SWATDIR);
+
+	while ((opt = getopt(argc, argv,"s:")) != EOF) {
+		switch (opt) {
+		case 's':
+			pstrcpy(servicesf,optarg);
+			break;	  
+		}
+	}
+
+
+	print_header();
+
+	charset_initialise();
+
+	/* if this binary is setuid then run completely as root */
+	setuid(0);
+
+	load_config();
+
+	cgi_load_variables(NULL);
+
+	show_main_buttons();
+
+	page = cgi_baseurl();
+
+	if (strcmp(page, "globals")==0) {
+		globals_page();
+	} else if (strcmp(page,"shares")==0) {
+		shares_page();
+	} else if (strcmp(page,"printers")==0) {
+		printers_page();
+	} else {
+		welcome_page();
+	}
+	
+	print_footer();
+	return 0;
+}
+
+
-- 
cgit 


From 6a37b245e3894c5a3a62bf38d4eef27be5f209e8 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 8 Mar 1998 14:31:50 +0000
Subject: allow for non-authenticated SWAT for demo purposes (This used to be
 commit 6e1237568b559c006ee5429308ac47e97cc4a1c4)

---
 source3/web/cgi.c  | 4 ++--
 source3/web/swat.c | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 7c84f47ada..83158fc1a5 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -548,7 +548,7 @@ static void cgi_download(char *file)
 setup the cgi framework, handling the possability that this program is either
 run as a true cgi program by a web browser or is itself a mini web server
   ***************************************************************************/
-void cgi_setup(char *rootdir)
+void cgi_setup(char *rootdir, int auth_required)
 {
 	int authenticated = 0;
 	char line[1024];
@@ -586,7 +586,7 @@ void cgi_setup(char *rootdir)
 		/* ignore all other requests! */
 	}
 
-	if (!authenticated) {
+	if (auth_required && !authenticated) {
 		cgi_setup_error("401 Authorization Required", 
 				"WWW-Authenticate: Basic realm=\"root\"\r\n",
 				"You must be authenticated to use this service");
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 4810d87af3..6a5b4f51f1 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -432,6 +432,7 @@ int main(int argc, char *argv[])
 	extern FILE *dbf;
 	int opt;
 	char *page;
+	int auth_required = 1;
 
 	/* just in case it goes wild ... */
 	alarm(300);
@@ -440,16 +441,18 @@ int main(int argc, char *argv[])
 
 	if (!dbf) dbf = stderr;
 
-	cgi_setup(SWATDIR);
-
-	while ((opt = getopt(argc, argv,"s:")) != EOF) {
+	while ((opt = getopt(argc, argv,"s:a")) != EOF) {
 		switch (opt) {
 		case 's':
 			pstrcpy(servicesf,optarg);
 			break;	  
+		case 'a':
+			auth_required = 0;
+			break;	  
 		}
 	}
 
+	cgi_setup(SWATDIR, auth_required);
 
 	print_header();
 
-- 
cgit 


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 


From 49a5dd09b9aaba81fa217c9d41fce5e1f90c054b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Mar 1998 04:56:58 +0000
Subject: added Date and Expires headers in the mini web server so clients know
 what they can cache. (This used to be commit
 b6055e40bb91775a29b756640d95910a6f19814f)

---
 source3/web/cgi.c  | 35 +++++++++++++++++++++++++----------
 source3/web/swat.c |  1 +
 2 files changed, 26 insertions(+), 10 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 9ce8c4d91e..2008f9a8d3 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -18,16 +18,16 @@
 */
 
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <pwd.h>
+#include "includes.h"
+#include "smb.h"
 
 #define MAX_VARIABLES 10000
 
+/* set the expiry on fixed pages */
+#define EXPIRY_TIME (60*60*24*7)
+
+#define CGI_LOGGING 0
+
 #ifdef DEBUG_COMMENTS
 extern void print_title(char *fmt, ...);
 #endif
@@ -524,12 +524,16 @@ static void cgi_download(char *file)
 	}
 	printf("HTTP/1.1 200 OK\r\n");
 	if ((p=strrchr(file,'.'))) {
-		if (strcmp(p,".gif")==0 || strcmp(p,".jpg")==0) {
+		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 {
 			printf("Content-Type: text/html\r\n");
 		}
 	}
+	printf("Expires: %s\r\n", http_timestring(time(NULL)+EXPIRY_TIME));
+
 	printf("Content-Length: %d\r\n\r\n", (int)st.st_size);
 	while ((l=read(fd,buf,sizeof(buf)))>0) {
 		fwrite(buf, 1, l, stdout);
@@ -549,6 +553,11 @@ void cgi_setup(char *rootdir, int auth_required)
 	char line[1024];
 	char *url=NULL;
 	char *p;
+#if CGI_LOGGING
+	FILE *f = fopen("/tmp/cgi.log", "a");
+
+	fprintf(f,"\n[Date: %s]\n", http_timestring(time(NULL)));
+#endif
 
 	if (chdir(rootdir)) {
 		cgi_setup_error("400 Server Error", "",
@@ -563,6 +572,9 @@ void cgi_setup(char *rootdir, int auth_required)
 	/* we are a mini-web server. We need to read the request from stdin
 	   and handle authentication etc */
 	while (fgets(line, sizeof(line)-1, stdin)) {
+#if CGI_LOGGING
+		fputs(line, f);
+#endif
 		if (line[0] == '\r' || line[0] == '\n') break;
 		if (strncasecmp(line,"GET ", 4)==0) {
 			request_get = 1;
@@ -580,6 +592,9 @@ void cgi_setup(char *rootdir, int auth_required)
 		}
 		/* ignore all other requests! */
 	}
+#if CGI_LOGGING
+	fclose(f);
+#endif
 
 	if (auth_required && !authenticated) {
 		cgi_setup_error("401 Authorization Required", 
@@ -606,12 +621,12 @@ void cgi_setup(char *rootdir, int auth_required)
 		*p = 0;
 	}
 
-	if (strstr(url+1,"..")==0 && file_exist(url+1)) {
+	if (strstr(url+1,"..")==0 && file_exist(url+1, NULL)) {
 		cgi_download(url+1);
 	}
 
 	printf("HTTP/1.1 200 OK\r\nConnection: close\r\n");
-
+	printf("Date: %s\r\n", http_timestring(time(NULL)));
 	baseurl = url+1;
 }
 
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 508c8944b4..ea93d3ccd1 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -35,6 +35,7 @@ static pstring servicesf = CONFIGFILE;
 /* start the page with standard stuff */
 static void print_header(void)
 {
+	printf("Expires: %s\r\n", http_timestring(time(NULL)));
 	printf("Content-type: text/html\r\n\r\n");
 	printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
 	printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY>\n\n");
-- 
cgit 


From 0987de0b1a2fd505d312259c54dac12a1c201294 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Mar 1998 05:47:01 +0000
Subject: added a "home" icon (This used to be commit
 60ef0b31a0e85164a89a70a4f0d4e675db25f35d)

---
 source3/web/swat.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index ea93d3ccd1..ab9de41b19 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -219,6 +219,7 @@ static void show_main_buttons(void)
 {
 	printf("<H2 align=center>Samba Web Administration Tool</H2>\n");
 
+	image_link("Home", "", "images/home.gif", 50, 50);
 	image_link("Globals", "globals", "images/globals.gif", 50, 50);
 	image_link("Shares", "shares", "images/shares.gif", 50, 50);
 	image_link("Printers", "printers", "images/printers.gif", 50, 50);
-- 
cgit 


From c0b06785c11eca0e037febfe887ce9dbb776d4e4 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Mar 1998 06:42:36 +0000
Subject: added status page to SWAT. Similar to smbstatus output but in a HTML
 table (This used to be commit 8e4a412dba3dc6458651ea042096687b3fcfdc0a)

---
 source3/web/swat.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 109 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index ab9de41b19..09d0f08ea6 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -32,10 +32,18 @@
 static pstring servicesf = CONFIGFILE;
 
 
+/* we need these because we link to locking*.o */
+ void become_root(BOOL save_dir) {}
+ void unbecome_root(BOOL restore_dir) {}
+connection_struct Connections[MAX_CONNECTIONS];
+files_struct Files[MAX_OPEN_FILES];
+struct current_user current_user;
+
+
 /* start the page with standard stuff */
 static void print_header(void)
 {
-	printf("Expires: %s\r\n", http_timestring(time(NULL)));
+	printf("Expires: 0\r\n");
 	printf("Content-type: text/html\r\n\r\n");
 	printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
 	printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY>\n\n");
@@ -70,7 +78,7 @@ static void include_html(char *fname)
 }
 
 
-/* display one editable parameter */
+/* display one editable parameter in a form */
 static void show_parameter(int snum, struct parm_struct *parm)
 {
 	int i;
@@ -151,6 +159,7 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 }
 
 
+/* save and reoad the smb.conf config file */
 static int save_reload(void)
 {
 	FILE *f;
@@ -223,6 +232,7 @@ static void show_main_buttons(void)
 	image_link("Globals", "globals", "images/globals.gif", 50, 50);
 	image_link("Shares", "shares", "images/shares.gif", 50, 50);
 	image_link("Printers", "printers", "images/printers.gif", 50, 50);
+	image_link("Status", "status", "images/status.gif", 50, 50);
 
 	printf("<HR>\n");
 }
@@ -427,6 +437,101 @@ static void printers_page(void)
 }
 
 
+static void print_share_mode(share_mode_entry *e, char *fname)
+{
+	printf("<tr><td>%d</td>",e->pid);
+	printf("<td>");
+	switch ((e->share_mode>>4)&0xF) {
+	case DENY_NONE: printf("DENY_NONE"); break;
+	case DENY_ALL:  printf("DENY_ALL   "); break;
+	case DENY_DOS:  printf("DENY_DOS   "); break;
+	case DENY_READ: printf("DENY_READ  "); break;
+	case DENY_WRITE:printf("DENY_WRITE "); break;
+	}
+	printf("</td>");
+
+	printf("<td>");
+	switch (e->share_mode&0xF) {
+	case 0: printf("RDONLY     "); break;
+	case 1: printf("WRONLY     "); break;
+	case 2: printf("RDWR       "); break;
+	}
+	printf("</td>");
+
+	printf("<td>");
+	if((e->op_type & 
+	    (EXCLUSIVE_OPLOCK|BATCH_OPLOCK)) == 
+	   (EXCLUSIVE_OPLOCK|BATCH_OPLOCK))
+		printf("EXCLUSIVE+BATCH ");
+	else if (e->op_type & EXCLUSIVE_OPLOCK)
+		printf("EXCLUSIVE       ");
+	else if (e->op_type & BATCH_OPLOCK)
+		printf("BATCH           ");
+	else
+		printf("NONE            ");
+	printf("</td>");
+
+	printf("<td>%s</td><td>%s</td></tr>\n",
+	       fname,asctime(LocalTime((time_t *)&e->time.tv_sec)));
+}
+
+
+/* show the current server status */
+static void status_page(void)
+{
+	struct connect_record crec;
+	pstring fname;
+	FILE *f;
+
+	printf("<H2>Server Status</H2>\n");
+
+	pstrcpy(fname,lp_lockdir());
+	standard_sub_basic(fname);
+	trim_string(fname,"","/");
+	strcat(fname,"/STATUS..LCK");
+
+	f = fopen(fname,"r");
+	if (!f) {
+		printf("Couldn't open status file %s\n",fname);
+		if (!lp_status(-1))
+			printf("You need to have status=yes in your smb config file\n");
+		return;
+	}
+
+
+	printf("\nSamba version %s\n<p>",VERSION);
+
+	printf("<h3>Active Connections</h3>\n");
+	printf("<table border=1>\n");
+	printf("<tr><th>Share</th><th>User</th><th>Group</th><th>PID</th><th>Client</th><th>Date</th></tr>\n\n");
+
+	while (!feof(f)) {
+		if (fread(&crec,sizeof(crec),1,f) != 1)
+			break;
+		if (crec.magic == 0x280267 && process_exists(crec.pid)) {
+			printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s (%s)</td><td>%s</td></tr>\n",
+			       crec.name,uidtoname(crec.uid),
+			       gidtoname(crec.gid),crec.pid,
+			       crec.machine,crec.addr,
+			       asctime(LocalTime(&crec.start)));
+		}
+	}
+
+	printf("</table><p>\n");
+
+	printf("<h3>Open Files</h3>\n");
+	printf("<table border=1>\n");
+	printf("<tr><th>PID</th><th>Sharing</th><th>R/W</th><th>Oplock</th><th>File</th><th>Date</th></tr>\n");
+
+	locking_init(1);
+	share_mode_forall(print_share_mode);
+	locking_end();
+	printf("</table>\n");
+
+	fclose(f);
+}
+
+
 int main(int argc, char *argv[])
 {
 	extern char *optarg;
@@ -477,6 +582,8 @@ int main(int argc, char *argv[])
 		shares_page();
 	} else if (strcmp(page,"printers")==0) {
 		printers_page();
+	} else if (strcmp(page,"status")==0) {
+		status_page();
 	} else {
 		welcome_page();
 	}
-- 
cgit 


From e1f131bab840f23b1ba5ae4ba36a4054857afc94 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 12 Mar 1998 02:42:39 +0000
Subject: use password_ok() instead of calling crypt() (This used to be commit
 53dc8ea5e315abf9ee8d38ffdb8a3057df0235be)

---
 source3/web/cgi.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 2008f9a8d3..6468c92917 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -459,8 +459,6 @@ handle a http authentication line
 static int cgi_handle_authorization(char *line)
 {
 	char *p, *user, *pass;
-	struct passwd *pwd;
-	int ret=0;
 
 	if (strncasecmp(line,"Basic ", 6)) {
 		cgi_setup_error("401 Bad Authorization", "", 
@@ -478,20 +476,13 @@ static int cgi_handle_authorization(char *line)
 	pass = p+1;
 
 	/* currently only allow connections as root */
-	if (strcasecmp(user,"root")) {
+	if (strcmp(user,"root")) {
 		cgi_setup_error("401 Bad Authorization", "", 
 				"incorrect username/password");
 	}
-	
-	pwd = getpwnam(user);
-
-	if (!strcmp((char *)crypt(pass, pwd->pw_passwd),pwd->pw_passwd)) {
-		ret = 1;
-	}
 
-	memset(pass, 0, strlen(pass));
 
-	return ret;
+	return password_ok(user, pass, strlen(pass), NULL);
 }
 
 
-- 
cgit 


From d5c1af5d9fb33e42e24dc3f1c0ea235eb1fb904a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 14 Mar 1998 04:13:24 +0000
Subject: fixed support for running swat via cgi-bin (This used to be commit
 9dbfb16990954ee3518ce3bc73e067c82b653930)

---
 source3/web/cgi.c  | 50 +++++++++++++++++++++++++++++++++++++++++++-------
 source3/web/swat.c | 10 +++++++---
 2 files changed, 50 insertions(+), 10 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 6468c92917..46654b1303 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -44,6 +44,7 @@ static int request_post;
 static int request_get;
 static char *query_string;
 static char *baseurl;
+static char *pathinfo;
 
 static void unescape(char *buf)
 {
@@ -545,9 +546,7 @@ void cgi_setup(char *rootdir, int auth_required)
 	char *url=NULL;
 	char *p;
 #if CGI_LOGGING
-	FILE *f = fopen("/tmp/cgi.log", "a");
-
-	fprintf(f,"\n[Date: %s]\n", http_timestring(time(NULL)));
+	FILE *f;
 #endif
 
 	if (chdir(rootdir)) {
@@ -560,11 +559,16 @@ void cgi_setup(char *rootdir, int auth_required)
 		return;
 	}
 
+#if CGI_LOGGING
+	f = fopen("/tmp/cgi.log", "a");
+	if (f) fprintf(f,"\n[Date: %s]\n", http_timestring(time(NULL)));
+#endif
+
 	/* we are a mini-web server. We need to read the request from stdin
 	   and handle authentication etc */
 	while (fgets(line, sizeof(line)-1, stdin)) {
 #if CGI_LOGGING
-		fputs(line, f);
+		if (f) fputs(line, f);
 #endif
 		if (line[0] == '\r' || line[0] == '\n') break;
 		if (strncasecmp(line,"GET ", 4)==0) {
@@ -584,7 +588,7 @@ void cgi_setup(char *rootdir, int auth_required)
 		/* ignore all other requests! */
 	}
 #if CGI_LOGGING
-	fclose(f);
+	if (f) fclose(f);
 #endif
 
 	if (auth_required && !authenticated) {
@@ -618,7 +622,8 @@ void cgi_setup(char *rootdir, int auth_required)
 
 	printf("HTTP/1.1 200 OK\r\nConnection: close\r\n");
 	printf("Date: %s\r\n", http_timestring(time(NULL)));
-	baseurl = url+1;
+	baseurl = "";
+	pathinfo = url+1;
 }
 
 
@@ -627,5 +632,36 @@ return the current pages URL
   ***************************************************************************/
 char *cgi_baseurl(void)
 {
-	return baseurl;
+	if (baseurl) {
+		return baseurl;
+	}
+	return getenv("SCRIPT_NAME");
 }
+
+/***************************************************************************
+return the root URL for images etc
+  ***************************************************************************/
+char *cgi_rooturl(void)
+{
+	if (baseurl) {
+		return "/";
+	}
+	return "/swat/";
+}
+
+
+/***************************************************************************
+return the current pages path info
+  ***************************************************************************/
+char *cgi_pathinfo(void)
+{
+	char *r;
+	if (pathinfo) {
+		return pathinfo;
+	}
+	r = getenv("PATH_INFO");
+	if (!r) return "";
+	if (*r == '/') r++;
+	return r;
+}
+
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 09d0f08ea6..987520d2cf 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -219,7 +219,11 @@ static void load_config(void)
 /* spit out the html for a link with an image */
 static void image_link(char *name,char *hlink, char *src, int width, int height)
 {
-	printf("<A HREF=\"%s\"><img width=%d height=%d src=\"%s\" alt=\"%s\"></A>\n", hlink, width, height, src, name);
+	printf("<A HREF=\"%s/%s\"><img width=%d height=%d src=\"%s%s\" alt=\"%s\"></A>\n", 
+	       cgi_baseurl(),
+	       hlink, width, height, 
+	       cgi_rooturl(),
+	       src, name);
 }
 
 /* display the main navigation controls at the top of each page along
@@ -562,7 +566,7 @@ int main(int argc, char *argv[])
 	cgi_setup(SWATDIR, auth_required);
 
 	print_header();
-
+	
 	charset_initialise();
 
 	/* if this binary is setuid then run completely as root */
@@ -574,7 +578,7 @@ int main(int argc, char *argv[])
 
 	show_main_buttons();
 
-	page = cgi_baseurl();
+	page = cgi_pathinfo();
 
 	if (strcmp(page, "globals")==0) {
 		globals_page();
-- 
cgit 


From 030923028009e5ef9d988f6d65922fac7a7635d5 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 14 Mar 1998 04:20:55 +0000
Subject: another fix for running under cgi-bin (This used to be commit
 6e2248532a063a83b682c967a65377488810f9eb)

---
 source3/web/swat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 987520d2cf..fc33a15a0e 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -88,8 +88,8 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		ptr = lp_local_ptr(snum, ptr);
 	}
 
-	printf("<tr><td><A HREF=\"help/parameters.html#%s\">?</A> %s</td><td>", 
-	       parm->label, parm->label);
+	printf("<tr><td><A HREF=\"%shelp/parameters.html#%s\">?</A> %s</td><td>", 
+	       cgi_rooturl(), parm->label, parm->label);
 
 	switch (parm->type) {
 	case P_CHAR:
-- 
cgit 


From 8326dad3d66bd11fe2736263642ba6c1640531e9 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 14 Mar 1998 08:29:06 +0000
Subject: - added separators - added "view config" button (This used to be
 commit 486a059fe169baedc605ee9bc0a0ca5a4165fe65)

---
 source3/web/swat.c | 56 +++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 13 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index fc33a15a0e..323dfc5adf 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -26,8 +26,7 @@
 #include "includes.h"
 #include "smb.h"
 
-#define GLOBALS_SNUM -2
-#define DEFAULTS_SNUM -1
+#define GLOBALS_SNUM -1
 
 static pstring servicesf = CONFIGFILE;
 
@@ -84,7 +83,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 	int i;
 	void *ptr = parm->ptr;
 
-	if (parm->class == P_LOCAL) {
+	if (parm->class == P_LOCAL && snum >= 0) {
 		ptr = lp_local_ptr(snum, ptr);
 	}
 
@@ -134,7 +133,8 @@ static void show_parameter(int snum, struct parm_struct *parm)
 			       (*(int *)ptr)==parm->enum_list[i].value?"CHECKED":"", 
 			       parm->enum_list[i].name);
 		break;
-			
+	case P_SEP:
+		break;
 	}
 	printf("</td></tr>\n");
 }
@@ -144,18 +144,27 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 {
 	int i = 0;
 	struct parm_struct *parm;
-
-	printf("<table>\n");
+	char *heading = NULL;
+	char *last_heading = NULL;
 
 	while ((parm = lp_next_parameter(snum, &i, allparameters))) {
+		if (snum < 0 && parm->class == P_LOCAL && !(parm->flags & FLAG_GLOBAL))
+			continue;
+		if (parm->class == P_SEPARATOR) {
+			heading = parm->label;
+			continue;
+		}
 		if (parm->flags & FLAG_HIDE) continue;
 		if (!advanced) {
 			if (!printers && !(parm->flags & FLAG_BASIC)) continue;
 			if (printers && !(parm->flags & FLAG_PRINT)) continue;
 		}
+		if (heading && heading != last_heading) {
+			printf("<tr><td></td></tr><tr><td><b><u>%s</u></b></td></tr>\n", heading);
+			last_heading = heading;
+		}
 		show_parameter(snum, parm);
 	}
-	printf("</table>\n");
 }
 
 
@@ -171,6 +180,7 @@ static int save_reload(void)
 	}
 
 	fprintf(f, "# Samba config file created using SWAT\n");
+	fprintf(f, "# Date: %s\n\n", timestring());
 
 	lp_dump(f);
 
@@ -178,7 +188,7 @@ static int save_reload(void)
 
 	lp_killunused(NULL);
 
-	if (!lp_load(servicesf,False)) {
+	if (!lp_load(servicesf,False,False,False)) {
                 printf("Can't reload %s\n", servicesf);
                 return 0;
         }
@@ -202,15 +212,13 @@ static void commit_parameters(int snum)
 			lp_do_parameter(snum, parm->label, v); 
 		}
 	}
-
-	save_reload();
 }
 
 
 /* load the smb.conf file into loadparm. */
 static void load_config(void)
 {
-	if (!lp_load(servicesf,False)) {
+	if (!lp_load(servicesf,False,True,False)) {
 		printf("<b>Can't load %s - using defaults</b><p>\n", 
 		       servicesf);
 	}
@@ -237,6 +245,7 @@ static void show_main_buttons(void)
 	image_link("Shares", "shares", "images/shares.gif", 50, 50);
 	image_link("Printers", "printers", "images/printers.gif", 50, 50);
 	image_link("Status", "status", "images/status.gif", 50, 50);
+	image_link("View Config", "viewconfig", "images/viewconfig.gif", 50, 50);
 
 	printf("<HR>\n");
 }
@@ -248,6 +257,16 @@ static void welcome_page(void)
 }
 
 
+/* display the current smb.conf  */
+static void viewconfig_page(void)
+{
+	printf("<H2>Current Config</H2>\n");
+	printf("<pre>");
+	include_html(servicesf);
+	printf("</pre>");
+}
+
+
 /* display a globals editing page  */
 static void globals_page(void)
 {
@@ -260,6 +279,7 @@ static void globals_page(void)
 
 	if (cgi_variable("Commit")) {
 		commit_parameters(GLOBALS_SNUM);
+		save_reload();
 	}
 
 	printf("<FORM method=post>\n");
@@ -272,7 +292,9 @@ static void globals_page(void)
 	}
 	printf("<p>\n");
 	
+	printf("<table>\n");
 	show_parameters(GLOBALS_SNUM, 1, advanced, 0);
+	printf("</table>\n");
 
 	if (advanced) {
 		printf("<input type=hidden name=\"Advanced\" value=1>\n");
@@ -300,6 +322,7 @@ static void shares_page(void)
 
 	if (cgi_variable("Commit") && snum >= 0) {
 		commit_parameters(snum);
+		save_reload();
 	}
 
 	if (cgi_variable("Delete") && snum >= 0) {
@@ -310,7 +333,7 @@ static void shares_page(void)
 	}
 
 	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
-		lp_copy_service(DEFAULTS_SNUM, share);
+		lp_copy_service(GLOBALS_SNUM, share);
 		save_reload();
 		snum = lp_servicenumber(share);
 	}
@@ -349,7 +372,9 @@ static void shares_page(void)
 	}
 
 	if (snum >= 0) {
+		printf("<table>\n");
 		show_parameters(snum, 1, advanced, 0);
+		printf("</table>\n");
 	}
 
 	if (advanced) {
@@ -379,6 +404,7 @@ static void printers_page(void)
 
 	if (cgi_variable("Commit") && snum >= 0) {
 		commit_parameters(snum);
+		save_reload();
 	}
 
 	if (cgi_variable("Delete") && snum >= 0) {
@@ -389,7 +415,7 @@ static void printers_page(void)
 	}
 
 	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
-		lp_copy_service(DEFAULTS_SNUM, share);
+		lp_copy_service(GLOBALS_SNUM, share);
 		snum = lp_servicenumber(share);
 		lp_do_parameter(snum, "print ok", "Yes");
 		save_reload();
@@ -430,7 +456,9 @@ static void printers_page(void)
 	}
 
 	if (snum >= 0) {
+		printf("<table>\n");
 		show_parameters(snum, 1, advanced, 1);
+		printf("</table>\n");
 	}
 
 	if (advanced) {
@@ -588,6 +616,8 @@ int main(int argc, char *argv[])
 		printers_page();
 	} else if (strcmp(page,"status")==0) {
 		status_page();
+	} else if (strcmp(page,"viewconfig")==0) {
+		viewconfig_page();
 	} else {
 		welcome_page();
 	}
-- 
cgit 


From e2b50d04ad5eb5fa7c10b59cf5ba0cfe374ab240 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 14 Mar 1998 11:24:01 +0000
Subject: if a local parameter is changed at the global level then propogate
 the change to all shares that are currently set to the default value. (This
 used to be commit b0e1183b2cbeb7a3150b7250cd19d14c9e5508b6)

---
 source3/web/swat.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 323dfc5adf..650740428f 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -198,6 +198,27 @@ static int save_reload(void)
 
 
 
+/* commit one parameter */
+static void commit_parameter(int snum, struct parm_struct *parm, char *v)
+{
+	int i;
+	char *s;
+
+	if (snum < 0 && parm->class == P_LOCAL) {
+		/* this handles the case where we are changing a local
+		   variable globally. We need to change the parameter in 
+		   all shares where it is currently set to the default */
+		for (i=0;i<lp_numservices();i++) {
+			s = lp_servicename(i);
+			if (s && (*s) && lp_is_default(i, parm)) {
+				lp_do_parameter(i, parm->label, v);
+			}
+		}
+	}
+
+	lp_do_parameter(snum, parm->label, v);
+}
+
 /* commit a set of parameters for a service */
 static void commit_parameters(int snum)
 {
@@ -209,7 +230,8 @@ static void commit_parameters(int snum)
 	while ((parm = lp_next_parameter(snum, &i, 1))) {
 		sprintf(label, "parm_%s", parm->label);
 		if ((v = cgi_variable(label))) {
-			lp_do_parameter(snum, parm->label, v); 
+			if (parm->flags & FLAG_HIDE) continue;
+			commit_parameter(snum, parm, v); 
 		}
 	}
 }
-- 
cgit 


From c063e9ec3e90508e846dd51e22a643c74c02f7c1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 14 Mar 1998 12:57:58 +0000
Subject: added the ability to start/stop the server from SWAT.

I needed to modify the way the pidfile is handled in nmbd and smbd to
do this. Jeremy, you may wish to look at what I've done as it probably
breaks the Whistle use of pidfiles. In particular I've removed the -f
option and instead smbd and nmbd always create a pidfile in the lock
directory.
(This used to be commit 20bb22d61b986d2036c681fc33db60f2b2b3c1c7)
---
 source3/web/swat.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 650740428f..422259a05a 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1,7 +1,7 @@
 /* 
    Unix SMB/Netbios implementation.
    Version 1.9.
-   html smb.conf editing - prototype only
+   Samba Web Administration Tool
    Copyright (C) Andrew Tridgell 1997-1998
    
    This program is free software; you can redistribute it and/or modify
@@ -537,8 +537,26 @@ static void status_page(void)
 	pstring fname;
 	FILE *f;
 
+	if (cgi_variable("smbd_start")) {
+		start_smbd();
+	}
+
+	if (cgi_variable("smbd_stop")) {
+		stop_smbd();
+	}
+
+	if (cgi_variable("nmbd_start")) {
+		start_nmbd();
+	}
+
+	if (cgi_variable("nmbd_stop")) {
+		stop_nmbd();
+	}
+
 	printf("<H2>Server Status</H2>\n");
 
+	printf("<FORM method=post>\n");
+
 	pstrcpy(fname,lp_lockdir());
 	standard_sub_basic(fname);
 	trim_string(fname,"","/");
@@ -553,9 +571,32 @@ static void status_page(void)
 	}
 
 
-	printf("\nSamba version %s\n<p>",VERSION);
+	printf("<table>\n");
+
+	printf("<tr><td>version:</td><td>%s</td></tr>",VERSION);
+
+	fflush(stdout);
+	if (smbd_running()) {
+		printf("<tr><td>smbd:</td><td>running</td><td><input type=submit name=\"smbd_stop\" value=\"Stop smbd\"></td></tr>\n");
+	} else {
+		printf("<tr><td>smbd:</td><td>not running</td><td><input type=submit name=\"smbd_start\" value=\"Start smbd\"></td></tr>\n");
+	}
+
+	fflush(stdout);
+	if (nmbd_running()) {
+		printf("<tr><td>nmbd:</td><td>running</td><td><input type=submit name=\"nmbd_stop\" value=\"Stop nmbd\"></td></tr>\n");
+	} else {
+		printf("<tr><td>nmbd:</td><td>not running</td><td><input type=submit name=\"nmbd_start\" value=\"Start nmbd\"></td></tr>\n");
+	}
+
+	printf("</table>\n");
+	fflush(stdout);
+
 
-	printf("<h3>Active Connections</h3>\n");
+	if (geteuid() != 0)
+		printf("<b>NOTE: You are not logged in as root and won't be able to start/stop the server</b><p>\n");
+	
+	printf("<p><h3>Active Connections</h3>\n");
 	printf("<table border=1>\n");
 	printf("<tr><th>Share</th><th>User</th><th>Group</th><th>PID</th><th>Client</th><th>Date</th></tr>\n\n");
 
@@ -583,6 +624,8 @@ static void status_page(void)
 	printf("</table>\n");
 
 	fclose(f);
+
+	printf("</FORM>\n");
 }
 
 
-- 
cgit 


From e02b05b5658fa50e6f94e604fc518a624211b6de Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 14 Mar 1998 13:00:09 +0000
Subject: new files to support starting/stopping the server (This used to be
 commit 087981009d57006ff80a0cf50891d4473f86f1bb)

---
 source3/web/diagnose.c  | 67 +++++++++++++++++++++++++++++++++++
 source3/web/startstop.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 160 insertions(+)
 create mode 100644 source3/web/diagnose.c
 create mode 100644 source3/web/startstop.c

(limited to 'source3/web')

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
new file mode 100644
index 0000000000..054de2a631
--- /dev/null
+++ b/source3/web/diagnose.c
@@ -0,0 +1,67 @@
+/* 
+   Unix SMB/Netbios implementation.
+   Version 1.9.
+   diagnosis tools for web admin
+   Copyright (C) Andrew Tridgell 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
+   (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.
+*/
+
+#include "includes.h"
+#include "smb.h"
+
+
+/* check to see if nmbd is running on localhost by looking for a __SAMBA__
+   response */
+BOOL nmbd_running(void)
+{
+	extern struct in_addr loopback_ip;
+	int fd, count;
+	struct in_addr *ip_list;
+
+	if ((fd = open_socket_in(SOCK_DGRAM, 0, 3,
+				 interpret_addr("127.0.0.1"))) != -1) {
+		if ((ip_list = name_query(fd, "__SAMBA__", 0, 
+					  True, True, loopback_ip,
+					  &count,0)) != NULL) {
+			free(ip_list);
+			close(fd);
+			return True;
+		}
+		close (fd);
+	}
+
+	return False;
+}
+
+
+/* check to see if smbd is running on localhost by trying to open a connection
+   then closing it */
+BOOL smbd_running(void)
+{
+	static struct cli_state cli;
+	extern struct in_addr loopback_ip;
+
+	if (!cli_initialise(&cli))
+		return False;
+
+	if (!cli_connect(&cli, "localhost", &loopback_ip)) {
+		cli_shutdown(&cli);
+		return False;
+	}
+
+	cli_shutdown(&cli);
+	return True;
+}
diff --git a/source3/web/startstop.c b/source3/web/startstop.c
new file mode 100644
index 0000000000..19781cc220
--- /dev/null
+++ b/source3/web/startstop.c
@@ -0,0 +1,93 @@
+/* 
+   Unix SMB/Netbios implementation.
+   Version 1.9.
+   start/stop nmbd and smbd
+   Copyright (C) Andrew Tridgell 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
+   (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.
+*/
+
+#include "includes.h"
+#include "smb.h"
+
+/* need to wait for daemons to startup */
+#define SLEEP_TIME 3
+
+/* startup smbd */
+void start_smbd(void)
+{
+	pstring binfile;
+
+	if (geteuid() != 0) return;
+
+	if (fork()) {
+		sleep(SLEEP_TIME);
+		return;
+	}
+
+	sprintf(binfile,"%s/smbd", SBINDIR);
+
+	become_daemon();
+
+	execl(binfile, "-D", NULL);
+
+	exit(0);
+}
+
+/* startup nmbd */
+void start_nmbd(void)
+{
+	pstring binfile;
+
+	if (geteuid() != 0) return;
+
+	if (fork()) {
+		sleep(SLEEP_TIME);
+		return;
+	}
+
+	sprintf(binfile,"%s/nmbd", SBINDIR);
+	
+	become_daemon();
+
+	execl(binfile, "-D", NULL);
+
+	exit(0);
+}
+
+
+/* stop smbd */
+void stop_smbd(void)
+{
+	unsigned pid = pidfile_pid("smbd");
+
+	if (geteuid() != 0) return;
+
+	if (pid == 0) return;
+
+	kill(pid, SIGTERM);
+}
+
+/* stop nmbd */
+void stop_nmbd(void)
+{
+	unsigned pid = pidfile_pid("nmbd");
+
+	if (geteuid() != 0) return;
+
+	if (pid == 0) return;
+
+	kill(pid, SIGTERM);
+}
-- 
cgit 


From 3070005521d49961d74476e69e1576598220bf74 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 14 Mar 1998 23:55:27 +0000
Subject: added a background image based on Pauls SAMBA logo but manipulated a
 little with GIMP (This used to be commit
 57f4dfcbf307ad4e261e59f0545d500b3bae71e5)

---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 422259a05a..d479df9c35 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -45,7 +45,7 @@ static void print_header(void)
 	printf("Expires: 0\r\n");
 	printf("Content-type: text/html\r\n\r\n");
 	printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
-	printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY>\n\n");
+	printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"%simages/background.gif\">\n\n", cgi_rooturl());
 }
 
 
-- 
cgit 


From 4dfe60de1022de492af3b837df3be13ed40c83f2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 15 Mar 1998 00:01:34 +0000
Subject: a smaller background (This used to be commit
 bcec95740f96aa4a3b022f41e2167cc74afeea92)

---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index d479df9c35..d9f890ce13 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -45,7 +45,7 @@ static void print_header(void)
 	printf("Expires: 0\r\n");
 	printf("Content-type: text/html\r\n\r\n");
 	printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
-	printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"%simages/background.gif\">\n\n", cgi_rooturl());
+	printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"%simages/background.jpg\">\n\n", cgi_rooturl());
 }
 
 
-- 
cgit 


From d360320618fe3a7f53ac1f05ee3ac54323a03c82 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 15 Mar 1998 02:37:52 +0000
Subject: - added the ability to kill off individual connections from SWAT
 (from   the status page) - split the claim_connection() code into its own
 file - fixed the claim_connection() code to lock the file when manipulating  
 it - always claim a null connection at startup - fixed a bug in the pidfile
 code (This used to be commit abd4a17e21d12be3d1747e94ceb1915abaf135e3)

---
 source3/web/startstop.c  |  11 +++
 source3/web/statuspage.c | 194 +++++++++++++++++++++++++++++++++++++++++++++++
 source3/web/swat.c       | 137 ---------------------------------
 3 files changed, 205 insertions(+), 137 deletions(-)
 create mode 100644 source3/web/statuspage.c

(limited to 'source3/web')

diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 19781cc220..e60b13ae66 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -91,3 +91,14 @@ void stop_nmbd(void)
 
 	kill(pid, SIGTERM);
 }
+
+/* kill a specified process */
+void kill_pid(int pid)
+{
+	if (geteuid() != 0) return;
+
+	if (pid <= 0) return;
+
+	kill(pid, SIGTERM);
+	sleep(SLEEP_TIME);
+}
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
new file mode 100644
index 0000000000..3a95d99d37
--- /dev/null
+++ b/source3/web/statuspage.c
@@ -0,0 +1,194 @@
+/* 
+   Unix SMB/Netbios implementation.
+   Version 1.9.
+   web status page
+   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
+   (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.
+*/
+
+#include "includes.h"
+
+
+static void print_share_mode(share_mode_entry *e, char *fname)
+{
+	printf("<tr><td>%d</td>",e->pid);
+	printf("<td>");
+	switch ((e->share_mode>>4)&0xF) {
+	case DENY_NONE: printf("DENY_NONE"); break;
+	case DENY_ALL:  printf("DENY_ALL   "); break;
+	case DENY_DOS:  printf("DENY_DOS   "); break;
+	case DENY_READ: printf("DENY_READ  "); break;
+	case DENY_WRITE:printf("DENY_WRITE "); break;
+	}
+	printf("</td>");
+
+	printf("<td>");
+	switch (e->share_mode&0xF) {
+	case 0: printf("RDONLY     "); break;
+	case 1: printf("WRONLY     "); break;
+	case 2: printf("RDWR       "); break;
+	}
+	printf("</td>");
+
+	printf("<td>");
+	if((e->op_type & 
+	    (EXCLUSIVE_OPLOCK|BATCH_OPLOCK)) == 
+	   (EXCLUSIVE_OPLOCK|BATCH_OPLOCK))
+		printf("EXCLUSIVE+BATCH ");
+	else if (e->op_type & EXCLUSIVE_OPLOCK)
+		printf("EXCLUSIVE       ");
+	else if (e->op_type & BATCH_OPLOCK)
+		printf("BATCH           ");
+	else
+		printf("NONE            ");
+	printf("</td>");
+
+	printf("<td>%s</td><td>%s</td></tr>\n",
+	       fname,asctime(LocalTime((time_t *)&e->time.tv_sec)));
+}
+
+
+/* show the current server status */
+void status_page(void)
+{
+	struct connect_record crec;
+	pstring fname;
+	FILE *f;
+	int i, pid;
+	char *v;
+
+	if (cgi_variable("smbd_start")) {
+		start_smbd();
+	}
+
+	if (cgi_variable("smbd_stop")) {
+		stop_smbd();
+	}
+
+	if (cgi_variable("nmbd_start")) {
+		start_nmbd();
+	}
+
+	if (cgi_variable("nmbd_stop")) {
+		stop_nmbd();
+	}
+
+	for (i=0;cgi_vnum(i, &v); i++) {
+		if (strncmp(v, "kill_", 5) != 0) continue;
+		pid = atoi(v+5);
+		if (pid > 0) {
+			printf("killing %d<br>\n", pid);
+			kill_pid(pid);
+		}
+	}
+
+
+	printf("<H2>Server Status</H2>\n");
+
+	printf("<FORM method=post>\n");
+
+	pstrcpy(fname,lp_lockdir());
+	standard_sub_basic(fname);
+	trim_string(fname,"","/");
+	strcat(fname,"/STATUS..LCK");
+
+	f = fopen(fname,"r");
+	if (!f) {
+		printf("Couldn't open status file %s\n",fname);
+		if (!lp_status(-1))
+			printf("You need to have status=yes in your smb config file\n");
+		return;
+	}
+
+
+	printf("<table>\n");
+
+	printf("<tr><td>version:</td><td>%s</td></tr>",VERSION);
+
+	fflush(stdout);
+	if (smbd_running()) {
+		printf("<tr><td>smbd:</td><td>running</td><td><input type=submit name=\"smbd_stop\" value=\"Stop smbd\"></td></tr>\n");
+	} else {
+		printf("<tr><td>smbd:</td><td>not running</td><td><input type=submit name=\"smbd_start\" value=\"Start smbd\"></td></tr>\n");
+	}
+
+	fflush(stdout);
+	if (nmbd_running()) {
+		printf("<tr><td>nmbd:</td><td>running</td><td><input type=submit name=\"nmbd_stop\" value=\"Stop nmbd\"></td></tr>\n");
+	} else {
+		printf("<tr><td>nmbd:</td><td>not running</td><td><input type=submit name=\"nmbd_start\" value=\"Start nmbd\"></td></tr>\n");
+	}
+
+	printf("</table>\n");
+	fflush(stdout);
+
+
+	if (geteuid() != 0)
+		printf("<b>NOTE: You are not logged in as root and won't be able to start/stop the server</b><p>\n");
+
+	printf("<p><h3>Active Connections</h3>\n");
+	printf("<table border=1>\n");
+	printf("<tr><th>PID</th><th>Client</th><th>IP address</th><th>Date</th><th>Kill</th></tr>\n");
+
+	while (!feof(f)) {
+		if (fread(&crec,sizeof(crec),1,f) != 1)
+			break;
+		if (crec.magic == 0x280267 && process_exists(crec.pid)) {
+			printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td><input type=submit value=\"X\" name=\"kill_%d\"></td></tr>\n",
+			       crec.pid,
+			       crec.machine,crec.addr,
+			       asctime(LocalTime(&crec.start)),
+			       crec.pid);
+		}
+	}
+
+	printf("</table><p>\n");
+
+	fseek(f, 0, SEEK_SET);
+	
+	printf("<p><h3>Active Shares</h3>\n");
+	printf("<table border=1>\n");
+	printf("<tr><th>Share</th><th>User</th><th>Group</th><th>PID</th><th>Client</th><th>Date</th></tr>\n\n");
+
+	while (!feof(f)) {
+		if (fread(&crec,sizeof(crec),1,f) != 1)
+			break;
+		if (crec.cnum == -1) continue;
+		if (crec.magic == 0x280267 && process_exists(crec.pid)) {
+			printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td></tr>\n",
+			       crec.name,uidtoname(crec.uid),
+			       gidtoname(crec.gid),crec.pid,
+			       crec.machine,
+			       asctime(LocalTime(&crec.start)));
+		}
+	}
+
+	printf("</table><p>\n");
+
+	printf("<h3>Open Files</h3>\n");
+	printf("<table border=1>\n");
+	printf("<tr><th>PID</th><th>Sharing</th><th>R/W</th><th>Oplock</th><th>File</th><th>Date</th></tr>\n");
+
+	locking_init(1);
+	share_mode_forall(print_share_mode);
+	locking_end();
+	printf("</table>\n");
+
+	fclose(f);
+
+	printf("</FORM>\n");
+}
+
diff --git a/source3/web/swat.c b/source3/web/swat.c
index d9f890ce13..1a12d99ffd 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -491,143 +491,6 @@ static void printers_page(void)
 }
 
 
-static void print_share_mode(share_mode_entry *e, char *fname)
-{
-	printf("<tr><td>%d</td>",e->pid);
-	printf("<td>");
-	switch ((e->share_mode>>4)&0xF) {
-	case DENY_NONE: printf("DENY_NONE"); break;
-	case DENY_ALL:  printf("DENY_ALL   "); break;
-	case DENY_DOS:  printf("DENY_DOS   "); break;
-	case DENY_READ: printf("DENY_READ  "); break;
-	case DENY_WRITE:printf("DENY_WRITE "); break;
-	}
-	printf("</td>");
-
-	printf("<td>");
-	switch (e->share_mode&0xF) {
-	case 0: printf("RDONLY     "); break;
-	case 1: printf("WRONLY     "); break;
-	case 2: printf("RDWR       "); break;
-	}
-	printf("</td>");
-
-	printf("<td>");
-	if((e->op_type & 
-	    (EXCLUSIVE_OPLOCK|BATCH_OPLOCK)) == 
-	   (EXCLUSIVE_OPLOCK|BATCH_OPLOCK))
-		printf("EXCLUSIVE+BATCH ");
-	else if (e->op_type & EXCLUSIVE_OPLOCK)
-		printf("EXCLUSIVE       ");
-	else if (e->op_type & BATCH_OPLOCK)
-		printf("BATCH           ");
-	else
-		printf("NONE            ");
-	printf("</td>");
-
-	printf("<td>%s</td><td>%s</td></tr>\n",
-	       fname,asctime(LocalTime((time_t *)&e->time.tv_sec)));
-}
-
-
-/* show the current server status */
-static void status_page(void)
-{
-	struct connect_record crec;
-	pstring fname;
-	FILE *f;
-
-	if (cgi_variable("smbd_start")) {
-		start_smbd();
-	}
-
-	if (cgi_variable("smbd_stop")) {
-		stop_smbd();
-	}
-
-	if (cgi_variable("nmbd_start")) {
-		start_nmbd();
-	}
-
-	if (cgi_variable("nmbd_stop")) {
-		stop_nmbd();
-	}
-
-	printf("<H2>Server Status</H2>\n");
-
-	printf("<FORM method=post>\n");
-
-	pstrcpy(fname,lp_lockdir());
-	standard_sub_basic(fname);
-	trim_string(fname,"","/");
-	strcat(fname,"/STATUS..LCK");
-
-	f = fopen(fname,"r");
-	if (!f) {
-		printf("Couldn't open status file %s\n",fname);
-		if (!lp_status(-1))
-			printf("You need to have status=yes in your smb config file\n");
-		return;
-	}
-
-
-	printf("<table>\n");
-
-	printf("<tr><td>version:</td><td>%s</td></tr>",VERSION);
-
-	fflush(stdout);
-	if (smbd_running()) {
-		printf("<tr><td>smbd:</td><td>running</td><td><input type=submit name=\"smbd_stop\" value=\"Stop smbd\"></td></tr>\n");
-	} else {
-		printf("<tr><td>smbd:</td><td>not running</td><td><input type=submit name=\"smbd_start\" value=\"Start smbd\"></td></tr>\n");
-	}
-
-	fflush(stdout);
-	if (nmbd_running()) {
-		printf("<tr><td>nmbd:</td><td>running</td><td><input type=submit name=\"nmbd_stop\" value=\"Stop nmbd\"></td></tr>\n");
-	} else {
-		printf("<tr><td>nmbd:</td><td>not running</td><td><input type=submit name=\"nmbd_start\" value=\"Start nmbd\"></td></tr>\n");
-	}
-
-	printf("</table>\n");
-	fflush(stdout);
-
-
-	if (geteuid() != 0)
-		printf("<b>NOTE: You are not logged in as root and won't be able to start/stop the server</b><p>\n");
-	
-	printf("<p><h3>Active Connections</h3>\n");
-	printf("<table border=1>\n");
-	printf("<tr><th>Share</th><th>User</th><th>Group</th><th>PID</th><th>Client</th><th>Date</th></tr>\n\n");
-
-	while (!feof(f)) {
-		if (fread(&crec,sizeof(crec),1,f) != 1)
-			break;
-		if (crec.magic == 0x280267 && process_exists(crec.pid)) {
-			printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s (%s)</td><td>%s</td></tr>\n",
-			       crec.name,uidtoname(crec.uid),
-			       gidtoname(crec.gid),crec.pid,
-			       crec.machine,crec.addr,
-			       asctime(LocalTime(&crec.start)));
-		}
-	}
-
-	printf("</table><p>\n");
-
-	printf("<h3>Open Files</h3>\n");
-	printf("<table border=1>\n");
-	printf("<tr><th>PID</th><th>Sharing</th><th>R/W</th><th>Oplock</th><th>File</th><th>Date</th></tr>\n");
-
-	locking_init(1);
-	share_mode_forall(print_share_mode);
-	locking_end();
-	printf("</table>\n");
-
-	fclose(f);
-
-	printf("</FORM>\n");
-}
-
 
 int main(int argc, char *argv[])
 {
-- 
cgit 


From 08a6e255fe8dec721b57aa15a4e606b11dc7f44d Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 15 Mar 1998 02:47:22 +0000
Subject: safer killing of connections - it ensures the process is still a
 valid smbd when killing (This used to be commit
 78675036e81e2cde7209d9e68956d71ef6661137)

---
 source3/web/statuspage.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 3a95d99d37..0031adde9f 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -86,16 +86,22 @@ void status_page(void)
 		stop_nmbd();
 	}
 
-	for (i=0;cgi_vnum(i, &v); i++) {
-		if (strncmp(v, "kill_", 5) != 0) continue;
-		pid = atoi(v+5);
-		if (pid > 0) {
-			printf("killing %d<br>\n", pid);
-			kill_pid(pid);
+	f = fopen(fname,"r");
+	if (f) {
+		while (!feof(f)) {
+			if (fread(&crec,sizeof(crec),1,f) != 1)	break;
+			if (crec.magic == 0x280267 && crec.cnum == -1 &&
+			    process_exists(crec.pid)) {
+				char buf[30];
+				sprintf(buf,"kill_%d", crec.pid);
+				if (cgi_variable(buf)) {
+					kill_pid(pid);
+				}
+			}
 		}
+		fclose(f);
 	}
 
-
 	printf("<H2>Server Status</H2>\n");
 
 	printf("<FORM method=post>\n");
-- 
cgit 


From 86f5105fbca56ab07f8a33e892fe656672600388 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 15 Mar 1998 03:06:50 +0000
Subject: - claim the null connection after the session request to mak sure we 
  have the netbios name

- fix another kill connection bug
(This used to be commit c634b799874795d42dae28fb4440ea452dc89b1b)
---
 source3/web/statuspage.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 0031adde9f..25a45928f2 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -67,8 +67,6 @@ void status_page(void)
 	struct connect_record crec;
 	pstring fname;
 	FILE *f;
-	int i, pid;
-	char *v;
 
 	if (cgi_variable("smbd_start")) {
 		start_smbd();
@@ -86,6 +84,12 @@ void status_page(void)
 		stop_nmbd();
 	}
 
+	pstrcpy(fname,lp_lockdir());
+	standard_sub_basic(fname);
+	trim_string(fname,"","/");
+	strcat(fname,"/STATUS..LCK");
+
+
 	f = fopen(fname,"r");
 	if (f) {
 		while (!feof(f)) {
@@ -95,7 +99,7 @@ void status_page(void)
 				char buf[30];
 				sprintf(buf,"kill_%d", crec.pid);
 				if (cgi_variable(buf)) {
-					kill_pid(pid);
+					kill_pid(crec.pid);
 				}
 			}
 		}
@@ -106,11 +110,6 @@ void status_page(void)
 
 	printf("<FORM method=post>\n");
 
-	pstrcpy(fname,lp_lockdir());
-	standard_sub_basic(fname);
-	trim_string(fname,"","/");
-	strcat(fname,"/STATUS..LCK");
-
 	f = fopen(fname,"r");
 	if (!f) {
 		printf("Couldn't open status file %s\n",fname);
@@ -152,7 +151,9 @@ void status_page(void)
 	while (!feof(f)) {
 		if (fread(&crec,sizeof(crec),1,f) != 1)
 			break;
-		if (crec.magic == 0x280267 && process_exists(crec.pid)) {
+		if (crec.magic == 0x280267 && 
+		    crec.cnum == -1 &&
+		    process_exists(crec.pid)) {
 			printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td><input type=submit value=\"X\" name=\"kill_%d\"></td></tr>\n",
 			       crec.pid,
 			       crec.machine,crec.addr,
-- 
cgit 


From 7a418233e27a21d0177fbc7ac657e9fdf74a0a4a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 15 Mar 1998 06:43:15 +0000
Subject: changed the date formatting (This used to be commit
 57aa1db47cda9c625cd1ef742fece14d14590590)

---
 source3/web/statuspage.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 25a45928f2..3ba46ff14f 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -22,6 +22,14 @@
 #include "includes.h"
 
 
+static char *tstring(time_t t)
+{
+	static pstring buf;
+	pstrcpy(buf, asctime(LocalTime(&t)));
+	string_sub(buf," ","&nbsp;");
+	return buf;
+}
+
 static void print_share_mode(share_mode_entry *e, char *fname)
 {
 	printf("<tr><td>%d</td>",e->pid);
@@ -57,7 +65,7 @@ static void print_share_mode(share_mode_entry *e, char *fname)
 	printf("</td>");
 
 	printf("<td>%s</td><td>%s</td></tr>\n",
-	       fname,asctime(LocalTime((time_t *)&e->time.tv_sec)));
+	       fname,tstring(e->time.tv_sec));
 }
 
 
@@ -157,7 +165,7 @@ void status_page(void)
 			printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td><input type=submit value=\"X\" name=\"kill_%d\"></td></tr>\n",
 			       crec.pid,
 			       crec.machine,crec.addr,
-			       asctime(LocalTime(&crec.start)),
+			       tstring(crec.start),
 			       crec.pid);
 		}
 	}
@@ -179,7 +187,7 @@ void status_page(void)
 			       crec.name,uidtoname(crec.uid),
 			       gidtoname(crec.gid),crec.pid,
 			       crec.machine,
-			       asctime(LocalTime(&crec.start)));
+			       tstring(crec.start));
 		}
 	}
 
-- 
cgit 


From 98034962747589c8066d29f1884ca06974aeb1f1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 17 Mar 1998 00:04:18 +0000
Subject: fixed call to execl() to get argv[0] right (thanks to Herb) (This
 used to be commit aaa4db4de3eb16d50d0263c8e69ace6217355f11)

---
 source3/web/startstop.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index e60b13ae66..5f7d2e6206 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -41,7 +41,7 @@ void start_smbd(void)
 
 	become_daemon();
 
-	execl(binfile, "-D", NULL);
+	execl(binfile, "smbd", "-D", NULL);
 
 	exit(0);
 }
@@ -62,7 +62,7 @@ void start_nmbd(void)
 	
 	become_daemon();
 
-	execl(binfile, "-D", NULL);
+	execl(binfile, "nmbd", "-D", NULL);
 
 	exit(0);
 }
-- 
cgit 


From 8ffcec16feaced3716554f3885085381815c99bf Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 17 Mar 1998 00:32:34 +0000
Subject: show full path in ps by setting it in argv[0] (This used to be commit
 89a4dc6cf9175d5fcdd827d90e4fed26576a4570)

---
 source3/web/startstop.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 5f7d2e6206..7ac66f2180 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -41,7 +41,7 @@ void start_smbd(void)
 
 	become_daemon();
 
-	execl(binfile, "smbd", "-D", NULL);
+	execl(binfile, binfile, "-D", NULL);
 
 	exit(0);
 }
@@ -62,7 +62,7 @@ void start_nmbd(void)
 	
 	become_daemon();
 
-	execl(binfile, "nmbd", "-D", NULL);
+	execl(binfile, binfile, "-D", NULL);
 
 	exit(0);
 }
-- 
cgit 


From 59d7006b05bb301e36f786b047b90ab9ef5be122 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 17 Mar 1998 11:44:16 +0000
Subject: - added "Full View"/"Normal View" on the "view config" page

- added the ability to auto-refresh the status page. There is a
  problem with this (it can kill inetd!). Hopefully we can fix that.
(This used to be commit 4488d8932fa072bf8a3ae236ab666618051b5e83)
---
 source3/web/statuspage.c | 33 +++++++++++++++++++++++++++++++++
 source3/web/swat.c       | 35 ++++++++++++++++++++++++++++-------
 2 files changed, 61 insertions(+), 7 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 3ba46ff14f..41681c2228 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -75,6 +75,9 @@ void status_page(void)
 	struct connect_record crec;
 	pstring fname;
 	FILE *f;
+	char *v;
+	int autorefresh=0;
+	int refresh_interval=30;
 
 	if (cgi_variable("smbd_start")) {
 		start_smbd();
@@ -92,6 +95,23 @@ void status_page(void)
 		stop_nmbd();
 	}
 
+	if (cgi_variable("autorefresh")) {
+		autorefresh = 1;
+	} else if (cgi_variable("norefresh")) {
+		autorefresh = 0;
+	} else if (cgi_variable("refresh")) {
+		autorefresh = 1;
+	}
+
+	if ((v=cgi_variable("refresh_interval"))) {
+		refresh_interval = atoi(v);
+	}
+
+	if (autorefresh) {
+		printf("<META HTTP-EQUIV=refresh CONTENT=\"%d;URL=%s/status?refresh=1&refresh_interval=%d\">\n", 
+		       refresh_interval, cgi_baseurl(), refresh_interval);
+	}
+
 	pstrcpy(fname,lp_lockdir());
 	standard_sub_basic(fname);
 	trim_string(fname,"","/");
@@ -118,6 +138,19 @@ void status_page(void)
 
 	printf("<FORM method=post>\n");
 
+	if (!autorefresh) {
+		printf("<input type=submit value=\"Auto Refresh\" name=autorefresh>\n");
+		printf("<br>Refresh Interval: ");
+		printf("<input type=text size=2 name=\"refresh_interval\" value=%d>\n", 
+		       refresh_interval);
+	} else {
+		printf("<input type=submit value=\"Stop Refreshing\" name=norefresh>\n");
+		printf("<br>Refresh Interval: %d\n", refresh_interval);
+		printf("<input type=hidden name=refresh value=1>\n");
+	}
+
+	printf("<p>\n");
+
 	f = fopen(fname,"r");
 	if (!f) {
 		printf("Couldn't open status file %s\n",fname);
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 1a12d99ffd..a41249a9ee 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -168,6 +168,16 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 }
 
 
+/* write a config file */
+static void write_config(FILE *f, BOOL show_defaults)
+{
+	fprintf(f, "# Samba config file created using SWAT\n");
+	fprintf(f, "# Date: %s\n\n", timestring());
+	
+	lp_dump(f, show_defaults);	
+}
+
+
 /* save and reoad the smb.conf config file */
 static int save_reload(void)
 {
@@ -179,11 +189,7 @@ static int save_reload(void)
 		return 0;
 	}
 
-	fprintf(f, "# Samba config file created using SWAT\n");
-	fprintf(f, "# Date: %s\n\n", timestring());
-
-	lp_dump(f);
-
+	write_config(f, False);
 	fclose(f);
 
 	lp_killunused(NULL);
@@ -282,10 +288,25 @@ static void welcome_page(void)
 /* display the current smb.conf  */
 static void viewconfig_page(void)
 {
+	int full_view=0;
+
+	if (cgi_variable("full_view")) {
+		full_view = 1;
+	}
+
 	printf("<H2>Current Config</H2>\n");
-	printf("<pre>");
-	include_html(servicesf);
+	printf("<form method=post>\n");
+
+	if (full_view) {
+		printf("<input type=submit name=\"normal_view\" value=\"Normal View\">\n");
+	} else {
+		printf("<input type=submit name=\"full_view\" value=\"Full View\">\n");
+	}
+
+	printf("<p><pre>");
+	write_config(stdout, !full_view);
 	printf("</pre>");
+	printf("</form>\n");
 }
 
 
-- 
cgit 


From f996885676f041437430bfd5843a3000611b0923 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 17 Mar 1998 12:31:43 +0000
Subject: this isn't a big commit, it just looks like it :-)

I needed the client_name() and client_addr() functions in swat so I
could tell who was connecting from where. The problem was that these
functions didn't take a file descriptor parameter they just used
the global "Client".

So I needed to change all calls to pass a parameter ... lots of files.
(This used to be commit a776058900a727591bd7b69debdaa25c0e31d693)
---
 source3/web/cgi.c  | 21 +++++++++++++++++++++
 source3/web/swat.c |  1 +
 2 files changed, 22 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 46654b1303..9931ca1468 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -665,3 +665,24 @@ char *cgi_pathinfo(void)
 	return r;
 }
 
+/***************************************************************************
+return the hostname of the client
+  ***************************************************************************/
+char *cgi_remote_host(void)
+{
+	if (baseurl) {
+		return client_name(1);
+	}
+	return getenv("REMOTE_HOST");
+}
+
+/***************************************************************************
+return the hostname of the client
+  ***************************************************************************/
+char *cgi_remote_addr(void)
+{
+	if (baseurl) {
+		return client_addr(1);
+	}
+	return getenv("REMOTE_ADDR");
+}
diff --git a/source3/web/swat.c b/source3/web/swat.c
index a41249a9ee..7378cf682b 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -172,6 +172,7 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 static void write_config(FILE *f, BOOL show_defaults)
 {
 	fprintf(f, "# Samba config file created using SWAT\n");
+	fprintf(f, "# from %s (%s)\n", cgi_remote_host(), cgi_remote_addr());
 	fprintf(f, "# Date: %s\n\n", timestring());
 	
 	lp_dump(f, show_defaults);	
-- 
cgit 


From d56fc8d169b0b29136b18c764ddb5d2fdfadbd76 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 17 Mar 1998 12:37:06 +0000
Subject: when CGI_LOGGING is on log the host name and IP

this is just so I can snoop on who is looking at the demo :-)
(This used to be commit 78abb9fec3aac235ad26d0192351dc81ade6c584)
---
 source3/web/cgi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 9931ca1468..c5b2ac55f1 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -561,7 +561,9 @@ void cgi_setup(char *rootdir, int auth_required)
 
 #if CGI_LOGGING
 	f = fopen("/tmp/cgi.log", "a");
-	if (f) fprintf(f,"\n[Date: %s]\n", http_timestring(time(NULL)));
+	if (f) fprintf(f,"\n[Date: %s   %s (%s)]\n", 
+		       http_timestring(time(NULL)),
+		       client_name(1), client_addr(1));
 #endif
 
 	/* we are a mini-web server. We need to read the request from stdin
-- 
cgit 


From e12cb8b6107272b625c8f34f3346b8314404f567 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 17 Mar 1998 14:46:17 +0000
Subject: oops, I got the sense of the show_defaults parameter to lp_dump()
 wrong. (This used to be commit b92c3b13d74acb39cdbd2c70eab2ef081c344d5a)

---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 7378cf682b..ae5a8006ce 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -305,7 +305,7 @@ static void viewconfig_page(void)
 	}
 
 	printf("<p><pre>");
-	write_config(stdout, !full_view);
+	write_config(stdout, full_view);
 	printf("</pre>");
 	printf("</form>\n");
 }
-- 
cgit 


From c8c61ac6a643d1c51c1546a6e346c566bb34f3b2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 18 Mar 1998 07:33:11 +0000
Subject: changed the method used for auto-reload on the status page to use
 JavaScript. This avoids the nasty inetd problem. (This used to be commit
 9d9b13880963a0e3cf5213ce2a24c52f4a11a472)

---
 source3/web/cgi.c        | 14 +++++++++++++-
 source3/web/statuspage.c | 14 +++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index c5b2ac55f1..065c524cb8 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -26,7 +26,7 @@
 /* set the expiry on fixed pages */
 #define EXPIRY_TIME (60*60*24*7)
 
-#define CGI_LOGGING 0
+#define CGI_LOGGING 1
 
 #ifdef DEBUG_COMMENTS
 extern void print_title(char *fmt, ...);
@@ -688,3 +688,15 @@ char *cgi_remote_addr(void)
 	}
 	return getenv("REMOTE_ADDR");
 }
+
+
+/***************************************************************************
+return True if the request was a POST
+  ***************************************************************************/
+BOOL cgi_waspost(void)
+{
+	if (baseurl) {
+		return request_post;
+	}
+	return strequal(getenv("REQUEST_METHOD"), "POST");
+}
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 41681c2228..98c0982b99 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -107,11 +107,6 @@ void status_page(void)
 		refresh_interval = atoi(v);
 	}
 
-	if (autorefresh) {
-		printf("<META HTTP-EQUIV=refresh CONTENT=\"%d;URL=%s/status?refresh=1&refresh_interval=%d\">\n", 
-		       refresh_interval, cgi_baseurl(), refresh_interval);
-	}
-
 	pstrcpy(fname,lp_lockdir());
 	standard_sub_basic(fname);
 	trim_string(fname,"","/");
@@ -147,6 +142,15 @@ void status_page(void)
 		printf("<input type=submit value=\"Stop Refreshing\" name=norefresh>\n");
 		printf("<br>Refresh Interval: %d\n", refresh_interval);
 		printf("<input type=hidden name=refresh value=1>\n");
+		/* this little JavaScript allows for automatic refresh
+                   of the page. There are other methods but this seems
+                   to be the best alternative */
+		printf("<script language=\"JavaScript\">\n");
+		printf("<!--\nsetTimeout('window.location.replace(\"%s/status?refresh_interval=%d&refresh=1\")', %d)\n", 
+		       cgi_baseurl(),
+		       refresh_interval,
+		       refresh_interval*1000);
+		printf("//-->\n</script>\n");
 	}
 
 	printf("<p>\n");
-- 
cgit 


From 78dd0fe44826761f93785f73ab5b7fdc88e2c4ea Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 18 Mar 1998 07:44:27 +0000
Subject: moved the refresh script to the end of the page so that silly things
 like a refresh of 0 actually work. (This used to be commit
 4c04e1d2aea64ba0b53846c04235669eef0b28ca)

---
 source3/web/statuspage.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 98c0982b99..5f89eee43a 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -142,15 +142,6 @@ void status_page(void)
 		printf("<input type=submit value=\"Stop Refreshing\" name=norefresh>\n");
 		printf("<br>Refresh Interval: %d\n", refresh_interval);
 		printf("<input type=hidden name=refresh value=1>\n");
-		/* this little JavaScript allows for automatic refresh
-                   of the page. There are other methods but this seems
-                   to be the best alternative */
-		printf("<script language=\"JavaScript\">\n");
-		printf("<!--\nsetTimeout('window.location.replace(\"%s/status?refresh_interval=%d&refresh=1\")', %d)\n", 
-		       cgi_baseurl(),
-		       refresh_interval,
-		       refresh_interval*1000);
-		printf("//-->\n</script>\n");
 	}
 
 	printf("<p>\n");
@@ -242,5 +233,17 @@ void status_page(void)
 	fclose(f);
 
 	printf("</FORM>\n");
+
+	if (autorefresh) {
+		/* this little JavaScript allows for automatic refresh
+                   of the page. There are other methods but this seems
+                   to be the best alternative */
+		printf("<script language=\"JavaScript\">\n");
+		printf("<!--\nsetTimeout('window.location.replace(\"%s/status?refresh_interval=%d&refresh=1\")', %d)\n", 
+		       cgi_baseurl(),
+		       refresh_interval,
+		       refresh_interval*1000);
+		printf("//-->\n</script>\n");
+	}
 }
 
-- 
cgit 


From 002176a37597b51b4f5e482d9c5e6a8f6b39257f Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 18 Mar 1998 07:51:57 +0000
Subject: don't set the Expires header on any page generated from a POST. This
 stops the "POST data has expired" problem when using the back button in
 netscape. (This used to be commit 112cf61cb6c24b7ea6d2d9a3cf96f68bf1c44560)

---
 source3/web/swat.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index ae5a8006ce..6d155d8804 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -42,7 +42,9 @@ struct current_user current_user;
 /* start the page with standard stuff */
 static void print_header(void)
 {
-	printf("Expires: 0\r\n");
+	if (!cgi_waspost()) {
+		printf("Expires: 0\r\n");
+	}
 	printf("Content-type: text/html\r\n\r\n");
 	printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
 	printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"%simages/background.jpg\">\n\n", cgi_rooturl());
-- 
cgit 


From bee4067bd4771ee7883ab6365e91df86a1230618 Mon Sep 17 00:00:00 2001
From: John Terpstra <jht@samba.org>
Date: Sat, 21 Mar 1998 03:03:59 +0000
Subject: Getting ready for first Red Hat Linux RPMs for 1.9.19 pre-alpha
 release (This used to be commit 4e424d0ba652bf9c5dfd3c44216b6145538cf821)

---
 source3/web/cgi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 065c524cb8..a1aa4d753d 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -26,7 +26,7 @@
 /* set the expiry on fixed pages */
 #define EXPIRY_TIME (60*60*24*7)
 
-#define CGI_LOGGING 1
+#define CGI_LOGGING 0
 
 #ifdef DEBUG_COMMENTS
 extern void print_title(char *fmt, ...);
-- 
cgit 


From 3eae1e3f8e53c51f638b1b381085f29feea1c517 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 30 Apr 1998 01:39:22 +0000
Subject: Added patch from Bruce Tenison <btenison@dibbs.net> to allow
 encrypted passwords to be stored over time, allowing a smbpasswd file
 migration. Adds new parameter "update encrypted". Will also add to 1.9.18
 branch. Docs update to follow. Jeremy. (This used to be commit
 5d3e874d780d595415cc27a7f5945fc2e694c3ac)

---
 source3/web/swat.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 6d155d8804..53131461c9 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -34,6 +34,8 @@ static pstring servicesf = CONFIGFILE;
 /* we need these because we link to locking*.o */
  void become_root(BOOL save_dir) {}
  void unbecome_root(BOOL restore_dir) {}
+/* We need this because we link to password.o */
+BOOL change_oem_password(struct smb_passwd *smbpw, char *new_passwd, BOOL override) {return False;}
 connection_struct Connections[MAX_CONNECTIONS];
 files_struct Files[MAX_OPEN_FILES];
 struct current_user current_user;
-- 
cgit 


From 51bc0c19c06f480c03cfc279388387c0aa8ae75c Mon Sep 17 00:00:00 2001
From: Herb Lewis <herb@samba.org>
Date: Fri, 8 May 1998 01:45:12 +0000
Subject: The globals section now shows non-default variables (like the view
 config section does) in the basic view. There is also a reset button to undo
 all changes you have made (that haven't been committed). In addition each
 field now has a "Set Default" button. Multi-choice fields are now select
 fields instead of a set of radio buttons.

On the status screen I added a "restart" option for stopping then
starting smbd and nmbd.
(This used to be commit a6edde4f004d3ba65d938acd3e6e094664a6c468)
---
 source3/web/statuspage.c |  19 +++++--
 source3/web/swat.c       | 129 ++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 125 insertions(+), 23 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 5f89eee43a..9bcc99a6af 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -79,6 +79,12 @@ void status_page(void)
 	int autorefresh=0;
 	int refresh_interval=30;
 
+	if (cgi_variable("smbd_restart")) {
+		if (smbd_running())
+			stop_smbd();
+		start_smbd();
+	}
+
 	if (cgi_variable("smbd_start")) {
 		start_smbd();
 	}
@@ -87,6 +93,11 @@ void status_page(void)
 		stop_smbd();
 	}
 
+	if (cgi_variable("nmbd_restart")) {
+		if (nmbd_running())
+			stop_nmbd();
+		start_nmbd();
+	}
 	if (cgi_variable("nmbd_start")) {
 		start_nmbd();
 	}
@@ -161,16 +172,16 @@ void status_page(void)
 
 	fflush(stdout);
 	if (smbd_running()) {
-		printf("<tr><td>smbd:</td><td>running</td><td><input type=submit name=\"smbd_stop\" value=\"Stop smbd\"></td></tr>\n");
+		printf("<tr><td>smbd:</td><td>running</td><td><input type=submit name=\"smbd_stop\" value=\"Stop smbd\"></td><td><input type=submit name=\"smbd_restart\" value=\"Restart smbd\"></td></tr>\n");
 	} else {
-		printf("<tr><td>smbd:</td><td>not running</td><td><input type=submit name=\"smbd_start\" value=\"Start smbd\"></td></tr>\n");
+		printf("<tr><td>smbd:</td><td>not running</td><td><input type=submit name=\"smbd_start\" value=\"Start smbd\"></td>><td><input type=submit name=\"smbd_restart\" value=\"Restart smbd\"></td></tr>\n");
 	}
 
 	fflush(stdout);
 	if (nmbd_running()) {
-		printf("<tr><td>nmbd:</td><td>running</td><td><input type=submit name=\"nmbd_stop\" value=\"Stop nmbd\"></td></tr>\n");
+		printf("<tr><td>nmbd:</td><td>running</td><td><input type=submit name=\"nmbd_stop\" value=\"Stop nmbd\"></td><td><input type=submit name=\"nmbd_restart\" value=\"Restart nmbd\"></td></tr>\n");
 	} else {
-		printf("<tr><td>nmbd:</td><td>not running</td><td><input type=submit name=\"nmbd_start\" value=\"Start nmbd\"></td></tr>\n");
+		printf("<tr><td>nmbd:</td><td>not running</td><td><input type=submit name=\"nmbd_start\" value=\"Start nmbd\"></td><td><input type=submit name=\"nmbd_restart\" value=\"Restart nmbd\"></td></tr>\n");
 	}
 
 	printf("</table>\n");
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 53131461c9..e95ac5abd4 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -40,6 +40,42 @@ connection_struct Connections[MAX_CONNECTIONS];
 files_struct Files[MAX_OPEN_FILES];
 struct current_user current_user;
 
+static int enum_index(int value, struct enum_list *enumlist)
+{
+int i;
+	for (i=0;enumlist[i].name;i++)
+		if (value == enumlist[i].value) break;
+	return(i);
+}
+
+static char *fix_backslash(char *string)
+{
+static char newstring[1024];
+char *p = newstring;
+
+	*p = '\0';
+        while (*string) {
+                if (*string == '\\') {*p++ = '\\';*p++ = '\\';}
+                else *p++ = *string;
+                ++string;
+                *p = '\0';
+        }
+	return newstring;
+}
+
+static char *make_parm_name(char *label)
+{
+static char parmname[1024];
+char *p = parmname;
+
+	while (*label) {
+		if (*label == ' ') *p++ = '_';
+		else *p++ = *label;
+		++label;
+		*p = '\0';
+	}
+	return parmname;
+}
 
 /* start the page with standard stuff */
 static void print_header(void)
@@ -97,45 +133,64 @@ static void show_parameter(int snum, struct parm_struct *parm)
 	switch (parm->type) {
 	case P_CHAR:
 		printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",
-		       parm->label, *(char *)ptr);
+		       make_parm_name(parm->label), *(char *)ptr);
+		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%c\'\">",
+			make_parm_name(parm->label),(char)(parm->def.cvalue));
 		break;
 
 	case P_STRING:
 	case P_USTRING:
 		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
-		       parm->label, *(char **)ptr);
+		       make_parm_name(parm->label), *(char **)ptr);
+		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+			make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
 		break;
 
 	case P_GSTRING:
 	case P_UGSTRING:
 		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
-		       parm->label, (char *)ptr);
+		       make_parm_name(parm->label), (char *)ptr);
+		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+			make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
 		break;
 
 	case P_BOOL:
-		printf("<input type=radio name=\"parm_%s\" value=Yes %s>yes&nbsp;&nbsp;", parm->label, (*(BOOL *)ptr)?"CHECKED":"");
-		printf("<input type=radio name=\"parm_%s\" value=No %s>no", parm->label, (*(BOOL *)ptr)?"":"CHECKED");
+		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
+		printf("<option %s>Yes", (*(BOOL *)ptr)?"selected":"");
+		printf("<option %s>No", (*(BOOL *)ptr)?"":"selected");
+		printf("</select>");
+		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
+			make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?0:1);
 		break;
 
 	case P_BOOLREV:
-		printf("<input type=radio name=\"parm_%s\" value=Yes %s>yes&nbsp;&nbsp;", parm->label, (*(BOOL *)ptr)?"":"CHECKED");
-		printf("<input type=radio name=\"parm_%s\" value=No %s>no", parm->label, (*(BOOL *)ptr)?"CHECKED":"");
+		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
+		printf("<option %s>Yes", (*(BOOL *)ptr)?"":"selected");
+		printf("<option %s>No", (*(BOOL *)ptr)?"selected":"");
+		printf("</select>");
+		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
+			make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?1:0);
 		break;
 
 	case P_INTEGER:
-		printf("<input type=text size=8 name=\"parm_%s\" value=%d>", parm->label, *(int *)ptr);
+		printf("<input type=text size=8 name=\"parm_%s\" value=%d>", make_parm_name(parm->label), *(int *)ptr);
+		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%d\'\">",
+			make_parm_name(parm->label),(int)(parm->def.ivalue));
 		break;
 
 	case P_OCTAL:
-		printf("<input type=text size=8 name=\"parm_%s\" value=0%o>", parm->label, *(int *)ptr);
+		printf("<input type=text size=8 name=\"parm_%s\" value=0%o>", make_parm_name(parm->label), *(int *)ptr);
+		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'0%o\'\">",
+			make_parm_name(parm->label),(int)(parm->def.ivalue));
 		break;
 
 	case P_ENUM:
+		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
 		for (i=0;parm->enum_list[i].name;i++)
-			printf("<input type=radio name=\"parm_%s\" value=%s %s>%s&nbsp;&nbsp;", 
-			       parm->label, parm->enum_list[i].name, 
-			       (*(int *)ptr)==parm->enum_list[i].value?"CHECKED":"", 
-			       parm->enum_list[i].name);
+			printf("<option %s>%s",(*(int *)ptr)==parm->enum_list[i].value?"selected":"",parm->enum_list[i].name);
+		printf("</select>");
+		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
+			make_parm_name(parm->label),enum_index((int)(parm->def.ivalue),parm->enum_list));
 		break;
 	case P_SEP:
 		break;
@@ -160,7 +215,42 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 		}
 		if (parm->flags & FLAG_HIDE) continue;
 		if (!advanced) {
-			if (!printers && !(parm->flags & FLAG_BASIC)) continue;
+			if (!printers && !(parm->flags & FLAG_BASIC)) {
+				void *ptr = parm->ptr;
+
+				switch (parm->type) {
+				case P_CHAR:
+					if (*(char *)ptr == (char)(parm->def.cvalue)) continue;
+					break;
+
+				case P_STRING:
+				case P_USTRING:
+					if (!strcmp(*(char **)ptr,(char *)(parm->def.svalue))) continue;
+					break;
+
+				case P_GSTRING:
+				case P_UGSTRING:
+					if (!strcmp((char *)ptr,(char *)(parm->def.svalue))) continue;
+					break;
+
+				case P_BOOL:
+				case P_BOOLREV:
+					if (*(BOOL *)ptr == (BOOL)(parm->def.bvalue)) continue;
+					break;
+
+				case P_INTEGER:
+				case P_OCTAL:
+					if (*(int *)ptr == (int)(parm->def.ivalue)) continue;
+					break;
+
+
+				case P_ENUM:
+					if (*(int *)ptr == (int)(parm->def.ivalue)) continue;
+					break;
+				case P_SEP:
+					continue;
+				}
+			}
 			if (printers && !(parm->flags & FLAG_PRINT)) continue;
 		}
 		if (heading && heading != last_heading) {
@@ -239,7 +329,7 @@ static void commit_parameters(int snum)
 	char *v;
 
 	while ((parm = lp_next_parameter(snum, &i, 1))) {
-		sprintf(label, "parm_%s", parm->label);
+		sprintf(label, "parm_%s", make_parm_name(parm->label));
 		if ((v = cgi_variable(label))) {
 			if (parm->flags & FLAG_HIDE) continue;
 			commit_parameter(snum, parm, v); 
@@ -330,9 +420,10 @@ static void globals_page(void)
 		save_reload();
 	}
 
-	printf("<FORM method=post>\n");
+	printf("<FORM name=\"swatform\" method=post>\n");
 
 	printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+	printf("<input type=reset name=\"Reset Values\" value=\"Reset Values\">\n");
 	if (advanced == 0) {
 		printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
 	} else {
@@ -348,7 +439,7 @@ static void globals_page(void)
 		printf("<input type=hidden name=\"Advanced\" value=1>\n");
 	}
 
-	printf("</form>\n");
+	printf("</FORM>\n");
 }
 
 /* display a shares editing page  */
@@ -386,7 +477,7 @@ static void shares_page(void)
 		snum = lp_servicenumber(share);
 	}
 
-	printf("<FORM method=post>\n");
+	printf("<FORM name=\"swatform\" method=post>\n");
 
 	printf("<table>\n");
 	printf("<tr><td><input type=submit name=selectshare value=\"Choose Share\"></td>\n");
@@ -470,7 +561,7 @@ static void printers_page(void)
 		snum = lp_servicenumber(share);
 	}
 
-	printf("<FORM method=post>\n");
+	printf("<FORM name=\"swatform\" method=post>\n");
 
 	printf("<table>\n");
 	printf("<tr><td><input type=submit name=selectshare value=\"Choose Printer\"></td>\n");
-- 
cgit 


From 9f57f01b144b030274cc5d116b864b3c27f251ef Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 8 May 1998 16:59:30 +0000
Subject: clitar.c: #ifdef'ed out all the bits that were giving 'defined but
 not used'           messages. nttrans.c: More updates. smb.h: Removed stuff
 that didn't belong in the smb_passwd struct. Persuaded Luke        to use a
 new structure. web/swat.c: Fixed gcc complaints about shadowing global
 'string'. Jeremy. (This used to be commit
 61c1dbb9785ed1e6fe40f93c7cc65024884df6f5)

---
 source3/web/swat.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index e95ac5abd4..b96c7d0ec7 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -48,16 +48,16 @@ int i;
 	return(i);
 }
 
-static char *fix_backslash(char *string)
+static char *fix_backslash(char *str)
 {
 static char newstring[1024];
 char *p = newstring;
 
 	*p = '\0';
-        while (*string) {
-                if (*string == '\\') {*p++ = '\\';*p++ = '\\';}
-                else *p++ = *string;
-                ++string;
+        while (*str) {
+                if (*str == '\\') {*p++ = '\\';*p++ = '\\';}
+                else *p++ = *str;
+                ++str;
                 *p = '\0';
         }
 	return newstring;
-- 
cgit 


From ffc88e2d26217f99c34ce24c0836bec3c809ca1a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 11 May 1998 06:35:45 +0000
Subject: changed to use slprintf() instead of sprintf() just about everywhere.
 I've implemented slprintf() as a bounds checked sprintf() using mprotect()
 and a non-writeable page.

This should prevent any sprintf based security holes.
(This used to be commit 6b0c1733d2ebf3b8f09f3bf88b8648d8b371bb1f)
---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index b96c7d0ec7..78c1fa4f19 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -329,7 +329,7 @@ static void commit_parameters(int snum)
 	char *v;
 
 	while ((parm = lp_next_parameter(snum, &i, 1))) {
-		sprintf(label, "parm_%s", make_parm_name(parm->label));
+		slprintf(label, sizeof(label)-1, "parm_%s", make_parm_name(parm->label));
 		if ((v = cgi_variable(label))) {
 			if (parm->flags & FLAG_HIDE) continue;
 			commit_parameter(snum, parm, v); 
-- 
cgit 


From f888868f46a5418bac9ab528497136c152895305 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 12 May 1998 00:55:32 +0000
Subject: This is a security audit change of the main source. It removed all
 ocurrences of the following functions :

sprintf
strcpy
strcat

The replacements are slprintf, safe_strcpy and safe_strcat.

It should not be possible to use code in Samba that uses
sprintf, strcpy or strcat, only the safe_equivalents.

Once Andrew has fixed the slprintf implementation then
this code will be moved back to the 1.9.18 code stream.

Jeremy.
(This used to be commit 2d774454005f0b54e5684cf618da7060594dfcbb)
---
 source3/web/cgi.c        | 10 +++++-----
 source3/web/startstop.c  |  4 ++--
 source3/web/statuspage.c |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index a1aa4d753d..5958b0a419 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -296,17 +296,17 @@ char *quotedup(char *s)
 	for (i=0;i<len;i++) {
 		switch (s[i]) {
 		case '<':
-			strcpy(d, "&lt;");
+			safe_strcpy(d, "&lt;", len + n*6 - (d - ret));
 			d += 4;
 			break;
 
 		case '>':
-			strcpy(d, "&gt;");
+			safe_strcpy(d, "&gt;", len + n*6 - (d - ret));
 			d += 4;
 			break;
 
 		case '&':
-			strcpy(d, "&amp;");
+			safe_strcpy(d, "&amp;", len + n*6 - (d - ret));
 			d += 5;
 			break;
 
@@ -347,7 +347,7 @@ char *urlquote(char *s)
 
 	for (i=0;i<len;i++) {
 		if (strchr(qlist,s[i])) {
-			sprintf(d, "%%%02X", (int)s[i]);
+			slprintf(d, len + n*2 - (d - ret), "%%%02X", (int)s[i]);
 			d += 3;
 		} else {
 			*d++ = s[i];
@@ -387,7 +387,7 @@ char *quotequotes(char *s)
 	for (i=0;i<len;i++) {
 		switch (s[i]) {
 		case '"':
-			strcpy(d, "&quot;");
+			safe_strcpy(d, "&quot;", len + n*6 - (d - ret));
 			d += 6;
 			break;
 
diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 7ac66f2180..63e5afead2 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -37,7 +37,7 @@ void start_smbd(void)
 		return;
 	}
 
-	sprintf(binfile,"%s/smbd", SBINDIR);
+	slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", SBINDIR);
 
 	become_daemon();
 
@@ -58,7 +58,7 @@ void start_nmbd(void)
 		return;
 	}
 
-	sprintf(binfile,"%s/nmbd", SBINDIR);
+	slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", SBINDIR);
 	
 	become_daemon();
 
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 9bcc99a6af..184f7e1f73 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -121,7 +121,7 @@ void status_page(void)
 	pstrcpy(fname,lp_lockdir());
 	standard_sub_basic(fname);
 	trim_string(fname,"","/");
-	strcat(fname,"/STATUS..LCK");
+	pstrcat(fname,"/STATUS..LCK");
 
 
 	f = fopen(fname,"r");
@@ -131,7 +131,7 @@ void status_page(void)
 			if (crec.magic == 0x280267 && crec.cnum == -1 &&
 			    process_exists(crec.pid)) {
 				char buf[30];
-				sprintf(buf,"kill_%d", crec.pid);
+				slprintf(buf,sizeof(buf)-1,"kill_%d", crec.pid);
 				if (cgi_variable(buf)) {
 					kill_pid(crec.pid);
 				}
-- 
cgit 


From 64578c0589a3a741f81fb55c16eeb882128da00b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 29 Jul 1998 03:08:05 +0000
Subject: merge from the autoconf2 branch to the main branch (This used to be
 commit 3bda7ac417107a7b01d91805ca71c4330657ed21)

---
 source3/web/.cvsignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 source3/web/.cvsignore

(limited to 'source3/web')

diff --git a/source3/web/.cvsignore b/source3/web/.cvsignore
new file mode 100644
index 0000000000..421376db9e
--- /dev/null
+++ b/source3/web/.cvsignore
@@ -0,0 +1 @@
+dummy
-- 
cgit 


From 8d42ee0f2c8cdd8d9f41e5e245999a9a6d44523f Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 29 Jul 1998 03:15:02 +0000
Subject: some merge cleanups (This used to be commit
 1d655b7c64231b0aec0548bb90fc3dcc3f37791c)

---
 source3/web/dummy.in | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 source3/web/dummy.in

(limited to 'source3/web')

diff --git a/source3/web/dummy.in b/source3/web/dummy.in
new file mode 100644
index 0000000000..e69de29bb2
-- 
cgit 


From fa88efbbacbbe74b72ddb9e316265de2aab31260 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 10 Aug 1998 07:04:53 +0000
Subject: split the system password checking routines out of smbd/password.c
 and into passdb/pass_check.c. This means SWAT no longer needs to link to
 smbd/password.c (This used to be commit
 90d93889d722670cbb517017531264630af759bf)

---
 source3/web/cgi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 5958b0a419..1a9d34d004 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -483,7 +483,7 @@ static int cgi_handle_authorization(char *line)
 	}
 
 
-	return password_ok(user, pass, strlen(pass), NULL);
+	return pass_check(user, pass, strlen(pass), NULL, NULL);
 }
 
 
-- 
cgit 


From b9623ab59e813131b1ed3f51616a46e719d59c21 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 14 Aug 1998 17:38:29 +0000
Subject: this is the bug change to using connection_struct* instead of cnum.
 Connections[] is now a local array in server.c

I might have broken something with this change. In particular the
oplock code is suspect and some .dll files aren't being oplocked when
I expected them to be. I'll look at it after I've got some sleep.
(This used to be commit c7ee025ead4a85b6fa44a832047b878451845fb6)
---
 source3/web/swat.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 78c1fa4f19..7c7a2ef205 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -36,9 +36,7 @@ static pstring servicesf = CONFIGFILE;
  void unbecome_root(BOOL restore_dir) {}
 /* We need this because we link to password.o */
 BOOL change_oem_password(struct smb_passwd *smbpw, char *new_passwd, BOOL override) {return False;}
-connection_struct Connections[MAX_CONNECTIONS];
 files_struct Files[MAX_OPEN_FILES];
-struct current_user current_user;
 
 static int enum_index(int value, struct enum_list *enumlist)
 {
-- 
cgit 


From e13aeea928dd89373cfaf3916c96f853c1227884 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 15 Aug 1998 01:19:26 +0000
Subject: configure: Changes for extra headers. configure.in: Source for header
 changes. client/clitar.c: Fixed isXXX macros & debugs for gcc pedantic
 compile. include/config.h.in: Added MEMSET, BZERO, MEMORY, RPCSVC_YPCLNT,
 STRINGS headers. include/includes.h: Headers for the above. include/smb.h:
 Made SIGNAL_CAST POSIX by default void (*)(int). lib/access.c: Fixed isXXX
 macros & debugs for gcc pedantic compile. lib/charset.c: Fixed isXXX macros &
 debugs for gcc pedantic compile. lib/debug.c: Fixed signal functs.
 lib/kanji.c: Fixed isXXX macros & debugs for gcc pedantic compile.
 lib/smbrun.c: Fixed isXXX macros & debugs for gcc pedantic compile.
 lib/util.c: Fixed isXXX macros & debugs for gcc pedantic compile.
 libsmb/namequery.c: Fixed isXXX macros & debugs for gcc pedantic compile.
 locking/shmem.c: Fixed isXXX macros & debugs for gcc pedantic compile.
 locking/shmem_sysv.c: Fixed error messages in sysV stuff. nmbd/asyncdns.c:
 Fixed signal functs. nmbd/nmbd.c: Fixed isXXX macros & debugs for gcc
 pedantic compile. passdb/passdb.c: Fixed isXXX macros & debugs for gcc
 pedantic compile. passdb/smbpassfile.c: Fixed isXXX macros & debugs for gcc
 pedantic compile. smbd/chgpasswd.c: Fixed isXXX macros & debugs for gcc
 pedantic compile. smbd/ipc.c: Fixed isXXX macros & debugs for gcc pedantic
 compile. smbd/nttrans.c: Fixed fsp code path. smbd/password.c: fixed
 HAVE_YP_GET_DEFAULT_DOMAIN problem. smbd/printing.c: Fixed isXXX macros &
 debugs for gcc pedantic compile. smbd/reply.c: Fixed isXXX macros & debugs
 for gcc pedantic compile. smbd/server.c: Fixed isXXX macros & debugs for gcc
 pedantic compile. smbd/trans2.c: Fixed core dump bug. smbd/uid.c: Fixed isXXX
 macros & debugs for gcc pedantic compile. Jeremy. (This used to be commit
 1b9cbcd02e575dc0a95fa589f720df30a4acc46b)

---
 source3/web/cgi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 1a9d34d004..20337e0459 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -499,7 +499,7 @@ static void cgi_download(char *file)
 
 	/* sanitise the filename */
 	for (i=0;file[i];i++) {
-		if (!isalnum(file[i]) && !strchr("/.-_", file[i])) {
+		if (!isalnum((int)file[i]) && !strchr("/.-_", file[i])) {
 			cgi_setup_error("404 File Not Found","",
 					"Illegal character in filename");
 		}
-- 
cgit 


From 127655cc888ac40332d4e8e5b94aab03f5120aae Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 15 Aug 1998 07:27:34 +0000
Subject: this checkin gets rid of the global Files[] array and makes it local
 in files.c

it should now be faily easy to expand the default MAX_OPEN_FILES to
many thousands.
(This used to be commit b088c804f98908eb02f05ab2f2e8a61691a0a582)
---
 source3/web/swat.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 7c7a2ef205..3a56c82229 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -36,7 +36,6 @@ static pstring servicesf = CONFIGFILE;
  void unbecome_root(BOOL restore_dir) {}
 /* We need this because we link to password.o */
 BOOL change_oem_password(struct smb_passwd *smbpw, char *new_passwd, BOOL override) {return False;}
-files_struct Files[MAX_OPEN_FILES];
 
 static int enum_index(int value, struct enum_list *enumlist)
 {
-- 
cgit 


From 296038d49800c8657e7cf718f308541630748e7f Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 1 Sep 1998 06:01:19 +0000
Subject: fixed a bug in the base64 hanlding that led to auth failures for some
 passwords with SWAT (This used to be commit
 edcde70108ab643a29f3e0e0cc97609287da6e87)

---
 source3/web/cgi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 20337e0459..ce1038231b 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -431,11 +431,11 @@ decode a base64 string in-place - simple and slow algorithm
 static void base64_decode(char *s)
 {
 	char *b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-	int bit_offset, byte_offset, idx, i;
+	int bit_offset, byte_offset, idx, i, n;
 	unsigned char *d = (unsigned char *)s;
 	char *p;
 
-	i=0;
+	n=i=0;
 
 	while (*s && (p=strchr(b64,*s))) {
 		idx = (int)(p - b64);
@@ -444,13 +444,17 @@ static void base64_decode(char *s)
 		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;
 }
 
 
-- 
cgit 


From 7b07680d3b1a302de8284df10658546b75da9887 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 1 Sep 1998 06:03:03 +0000
Subject: spruced up SWAT a bit - it now uses the new Samba logo at the top and
 a table to give it a little border (This used to be commit
 d35c6e80988d96049d4624b47ae9ea015edafc59)

---
 source3/web/swat.c | 48 +++++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 21 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 3a56c82229..504552ec40 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -74,26 +74,9 @@ char *p = parmname;
 	return parmname;
 }
 
-/* start the page with standard stuff */
-static void print_header(void)
-{
-	if (!cgi_waspost()) {
-		printf("Expires: 0\r\n");
-	}
-	printf("Content-type: text/html\r\n\r\n");
-	printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
-	printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"%simages/background.jpg\">\n\n", cgi_rooturl());
-}
-
-
-/* finish off the page */
-static void print_footer(void)
-{
-	printf("\n</BODY>\n</HTML>\n");
-}
 
 /* include a lump of html in a page */
-static void include_html(char *fname)
+static int include_html(char *fname)
 {
 	FILE *f = fopen(fname,"r");
 	char buf[1024];
@@ -101,7 +84,7 @@ static void include_html(char *fname)
 
 	if (!f) {
 		printf("ERROR: Can't open %s\n", fname);
-		return;
+		return 0;
 	}
 
 	while (!feof(f)) {
@@ -111,9 +94,34 @@ static void include_html(char *fname)
 	}
 
 	fclose(f);
+	return 1;
+}
+
+/* start the page with standard stuff */
+static void print_header(void)
+{
+	if (!cgi_waspost()) {
+		printf("Expires: 0\r\n");
+	}
+	printf("Content-type: text/html\r\n\r\n");
+
+	if (!include_html("include/header.html")) {
+		printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
+		printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"%simages/background.jpg\">\n\n", cgi_rooturl());
+	}
 }
 
 
+/* finish off the page */
+static void print_footer(void)
+{
+	if (!include_html("include/footer.html")) {
+		printf("\n</BODY>\n</HTML>\n");
+	}
+}
+
+
+
 /* display one editable parameter in a form */
 static void show_parameter(int snum, struct parm_struct *parm)
 {
@@ -358,8 +366,6 @@ static void image_link(char *name,char *hlink, char *src, int width, int height)
    with a title */
 static void show_main_buttons(void)
 {
-	printf("<H2 align=center>Samba Web Administration Tool</H2>\n");
-
 	image_link("Home", "", "images/home.gif", 50, 50);
 	image_link("Globals", "globals", "images/globals.gif", 50, 50);
 	image_link("Shares", "shares", "images/shares.gif", 50, 50);
-- 
cgit 


From 18556274139cc5a00593471bd745354d98a35303 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 1 Sep 1998 20:11:54 +0000
Subject: More abstraction of file system data types, to move to a 64 bit file
 interface for the NT SMB's.

Created a new define, SMB_STRUCT_STAT that currently is
defined to be struct stat - this wil change to a user
defined type containing 64 bit info when the correct
wrappers are written for 64 bit stat(), fstat() and lstat()
calls.

Also changed all sys_xxxx() calls that were previously just
wrappers to the same call prefixed by a dos_to_unix() call
into dos_xxxx() calls. This makes it explicit when a pathname
translation is being done, and when it is not.

Now, all sys_xxx() calls are meant to be wrappers to mask
OS differences, and not silently converting filenames on
the fly.

Jeremy.
(This used to be commit 28aa182dbffaa4ffd86047e608400de4b26e80eb)
---
 source3/web/cgi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index ce1038231b..9804f93adf 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -496,7 +496,7 @@ handle a file download
   ***************************************************************************/
 static void cgi_download(char *file)
 {
-	struct stat st;
+	SMB_STRUCT_STAT st;
 	char buf[1024];
 	int fd, l, i;
 	char *p;
-- 
cgit 


From b68d65d4bc5de98356863d640ebb3d0985066064 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 2 Sep 1998 02:02:30 +0000
Subject: use /swat/ prefix in both inetd and cgi modes, to enable a static
 header.html (This used to be commit ddb788c24d043b18506138a7759b8128df1673aa)

---
 source3/web/cgi.c  | 18 ++++--------------
 source3/web/swat.c |  9 ++++-----
 2 files changed, 8 insertions(+), 19 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 9804f93adf..97dac86668 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -622,8 +622,10 @@ void cgi_setup(char *rootdir, int auth_required)
 		*p = 0;
 	}
 
-	if (strstr(url+1,"..")==0 && file_exist(url+1, NULL)) {
-		cgi_download(url+1);
+	string_sub(url, "/swat/", "");
+
+	if (strstr(url,"..")==0 && file_exist(url, NULL)) {
+		cgi_download(url);
 	}
 
 	printf("HTTP/1.1 200 OK\r\nConnection: close\r\n");
@@ -644,18 +646,6 @@ char *cgi_baseurl(void)
 	return getenv("SCRIPT_NAME");
 }
 
-/***************************************************************************
-return the root URL for images etc
-  ***************************************************************************/
-char *cgi_rooturl(void)
-{
-	if (baseurl) {
-		return "/";
-	}
-	return "/swat/";
-}
-
-
 /***************************************************************************
 return the current pages path info
   ***************************************************************************/
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 504552ec40..2665df5d1b 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -107,7 +107,7 @@ static void print_header(void)
 
 	if (!include_html("include/header.html")) {
 		printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
-		printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"%simages/background.jpg\">\n\n", cgi_rooturl());
+		printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"/swat/images/background.jpg\">\n\n");
 	}
 }
 
@@ -132,8 +132,8 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		ptr = lp_local_ptr(snum, ptr);
 	}
 
-	printf("<tr><td><A HREF=\"%shelp/parameters.html#%s\">?</A> %s</td><td>", 
-	       cgi_rooturl(), parm->label, parm->label);
+	printf("<tr><td><A HREF=\"/swat/help/parameters.html#%s\">?</A> %s</td><td>", 
+	       parm->label, parm->label);
 
 	switch (parm->type) {
 	case P_CHAR:
@@ -355,10 +355,9 @@ static void load_config(void)
 /* spit out the html for a link with an image */
 static void image_link(char *name,char *hlink, char *src, int width, int height)
 {
-	printf("<A HREF=\"%s/%s\"><img width=%d height=%d src=\"%s%s\" alt=\"%s\"></A>\n", 
+	printf("<A HREF=\"%s/%s\"><img width=%d height=%d src=\"/swat/%s\" alt=\"%s\"></A>\n", 
 	       cgi_baseurl(),
 	       hlink, width, height, 
-	       cgi_rooturl(),
 	       src, name);
 }
 
-- 
cgit 


From e9ea36e4d2270bd7d32da12ef6d6e2299641582d Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 5 Sep 1998 05:07:05 +0000
Subject: tridge the destroyer returns!

prompted by the interpret_security() dead code that Jean-Francois
pointed out I added a make target "finddead" that finds potentially
dead (ie. unused) code. It spat out 304 function names ...

I went through these are deleted many of them, making others static
(finddead also reports functions that are used only in the local
file).

in doing this I have almost certainly deleted some useful code. I may
have even prevented compilation with some compile options. I
apologise. I decided it was better to get rid of this code now and add
back the one or two functions that are needed than to keep all this
baggage.

So, if I have done a bit too much "destroying" then let me know. Keep
the swearing to a minimum :)

One bit I didn't do is the ubibt code. Chris, can you look at that?
Heaps of unused functions there. Can they be made static?
(This used to be commit 2204475c87f3024ea8fd1fbd7385b2def617a46f)
---
 source3/web/cgi.c | 168 ------------------------------------------------------
 1 file changed, 168 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 97dac86668..874447359b 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -247,174 +247,6 @@ char *cgi_variable(char *name)
 	return NULL;
 }
 
-/***************************************************************************
-return a particular cgi variable
-  ***************************************************************************/
-char *cgi_vnum(int i, char **name)
-{
-	if (i < 0 || i >= num_variables) return NULL;
-	*name = variables[i].name;
-	return variables[i].value;
-}
-
-/***************************************************************************
-  return the value of a CGI boolean variable.
-  ***************************************************************************/
-int cgi_boolean(char *name, int def)
-{
-	char *p = cgi_variable(name);
-
-	if (!p) return def;
-
-	return strcmp(p, "1") == 0;
-}
-
-/***************************************************************************
-like strdup() but quotes < > and &
-  ***************************************************************************/
-char *quotedup(char *s)
-{
-	int i, n=0;
-	int len;
-	char *ret;
-	char *d;
-
-	if (!s) return strdup("");
-
-	len = strlen(s);
-
-	for (i=0;i<len;i++)
-		if (s[i] == '<' || s[i] == '>' || s[i] == '&')
-			n++;
-
-	ret = malloc(len + n*6 + 1);
-
-	if (!ret) return NULL;
-
-	d = ret;
-
-	for (i=0;i<len;i++) {
-		switch (s[i]) {
-		case '<':
-			safe_strcpy(d, "&lt;", len + n*6 - (d - ret));
-			d += 4;
-			break;
-
-		case '>':
-			safe_strcpy(d, "&gt;", len + n*6 - (d - ret));
-			d += 4;
-			break;
-
-		case '&':
-			safe_strcpy(d, "&amp;", len + n*6 - (d - ret));
-			d += 5;
-			break;
-
-		default:
-			*d++ = s[i];
-		}
-	}
-
-	*d = 0;
-
-	return ret;
-}
-
-
-/***************************************************************************
-like strdup() but quotes a wide range of characters
-  ***************************************************************************/
-char *urlquote(char *s)
-{
-	int i, n=0;
-	int len;
-	char *ret;
-	char *d;
-	char *qlist = "\"\n\r'&<> \t+;";
-
-	if (!s) return strdup("");
-
-	len = strlen(s);
-
-	for (i=0;i<len;i++)
-		if (strchr(qlist, s[i])) n++;
-
-	ret = malloc(len + n*2 + 1);
-
-	if (!ret) return NULL;
-
-	d = ret;
-
-	for (i=0;i<len;i++) {
-		if (strchr(qlist,s[i])) {
-			slprintf(d, len + n*2 - (d - ret), "%%%02X", (int)s[i]);
-			d += 3;
-		} else {
-			*d++ = s[i];
-		}
-	}
-
-	*d = 0;
-
-	return ret;
-}
-
-
-/***************************************************************************
-like strdup() but quotes " characters
-  ***************************************************************************/
-char *quotequotes(char *s)
-{
-	int i, n=0;
-	int len;
-	char *ret;
-	char *d;
-
-	if (!s) return strdup("");
-
-	len = strlen(s);
-
-	for (i=0;i<len;i++)
-		if (s[i] == '"')
-			n++;
-
-	ret = malloc(len + n*6 + 1);
-
-	if (!ret) return NULL;
-
-	d = ret;
-
-	for (i=0;i<len;i++) {
-		switch (s[i]) {
-		case '"':
-			safe_strcpy(d, "&quot;", len + n*6 - (d - ret));
-			d += 6;
-			break;
-
-		default:
-			*d++ = s[i];
-		}
-	}
-
-	*d = 0;
-
-	return ret;
-}
-
-
-/***************************************************************************
-quote spaces in a buffer
-  ***************************************************************************/
-void quote_spaces(char *buf)
-{
-	while (*buf) {
-		if (*buf == ' ') *buf = '+';
-		buf++;
-	}
-}
-
-
-
 /***************************************************************************
 tell a browser about a fatal error in the http processing
   ***************************************************************************/
-- 
cgit 


From e649750cb4d2d2577f0577b1d7a87ae4daf8fb6f Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <oliva@samba.org>
Date: Mon, 21 Sep 1998 09:07:08 +0000
Subject: major autoconf clean-up fix problems in builds with srcdir!=builddir
 (This used to be commit 1ffc3b807a3f80644c974b454ff5e6f68e89b546)

---
 source3/web/dummy.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/web')

diff --git a/source3/web/dummy.in b/source3/web/dummy.in
index e69de29bb2..8b13789179 100644
--- a/source3/web/dummy.in
+++ b/source3/web/dummy.in
@@ -0,0 +1 @@
+
-- 
cgit 


From ac39ce3eba28eed97942e915f7b4cd77cdfd9e2d Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <oliva@samba.org>
Date: Mon, 21 Sep 1998 11:34:44 +0000
Subject: replace getpass() with getsmbpass() if getsmbpass.c compiles (This
 used to be commit 9a5bdf5c1bef689fe0d6879949df869efbc34783)

---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 2665df5d1b..7a2f081d26 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -611,7 +611,7 @@ static void printers_page(void)
 
 
 
-int main(int argc, char *argv[])
+ int main(int argc, char *argv[])
 {
 	extern char *optarg;
 	extern int optind;
-- 
cgit 


From cf971f88ac188eec353a7fb021744b8076cc4eb7 Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <oliva@samba.org>
Date: Mon, 28 Sep 1998 00:14:36 +0000
Subject: automated generation of .dummy files for each subdirectory; dummy.in
 files are no longer needed, and new directories will be taken care of
 automatically, at configure (or config.status --recheck) time (This used to
 be commit 237a8e5fe62d757c04b8207cbbee4df1470cfe4e)

---
 source3/web/dummy.in | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 source3/web/dummy.in

(limited to 'source3/web')

diff --git a/source3/web/dummy.in b/source3/web/dummy.in
deleted file mode 100644
index 8b13789179..0000000000
--- a/source3/web/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-
-- 
cgit 


From cf3a9741dc7427efb97eff09a3c197a906ce6767 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 28 Sep 1998 21:43:48 +0000
Subject: Changes to test in configure if capabilities are enabled on a system.
 Changes to get Samba to compile cleanly with the IRIX compiler with the
 options : -fullwarn -woff 1209,1174 (the -woff options are to turn off
 warnings about unused function parameters and controlling loop expressions
 being constants). Split prototype generation as we hit a limit in IRIX nawk.
 Removed "." code in smbd/filename.c (yet again :-). Jeremy. (This used to be
 commit e0567433bd72aec17bf5a54cc292701095d25f09)

---
 source3/web/cgi.c       | 2 --
 source3/web/startstop.c | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 874447359b..bf99a67a04 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -41,7 +41,6 @@ static struct var variables[MAX_VARIABLES];
 static int num_variables;
 static int content_length;
 static int request_post;
-static int request_get;
 static char *query_string;
 static char *baseurl;
 static char *pathinfo;
@@ -410,7 +409,6 @@ void cgi_setup(char *rootdir, int auth_required)
 #endif
 		if (line[0] == '\r' || line[0] == '\n') break;
 		if (strncasecmp(line,"GET ", 4)==0) {
-			request_get = 1;
 			url = strdup(&line[4]);
 		} else if (strncasecmp(line,"POST ", 5)==0) {
 			request_post = 1;
diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 63e5afead2..9eeac96cc0 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -71,7 +71,7 @@ void start_nmbd(void)
 /* stop smbd */
 void stop_smbd(void)
 {
-	unsigned pid = pidfile_pid("smbd");
+	pid_t pid = pidfile_pid("smbd");
 
 	if (geteuid() != 0) return;
 
@@ -83,7 +83,7 @@ void stop_smbd(void)
 /* stop nmbd */
 void stop_nmbd(void)
 {
-	unsigned pid = pidfile_pid("nmbd");
+	pid_t pid = pidfile_pid("nmbd");
 
 	if (geteuid() != 0) return;
 
@@ -93,7 +93,7 @@ void stop_nmbd(void)
 }
 
 /* kill a specified process */
-void kill_pid(int pid)
+void kill_pid(pid_t pid)
 {
 	if (geteuid() != 0) return;
 
-- 
cgit 


From a2d7f765e8500f23c126c7b7cb6bb346adc11641 Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <oliva@samba.org>
Date: Tue, 29 Sep 1998 04:52:17 +0000
Subject: get away with dummy and .dummy files (This used to be commit
 90a8a02484a0897b053fd6531b7fec5d23098b6f)

---
 source3/web/.cvsignore | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/.cvsignore b/source3/web/.cvsignore
index 421376db9e..e69de29bb2 100644
--- a/source3/web/.cvsignore
+++ b/source3/web/.cvsignore
@@ -1 +0,0 @@
-dummy
-- 
cgit 


From 46fcd85b2dbe32c0f78a9382f8c3e2db92416391 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 26 Oct 1998 10:55:29 +0000
Subject: report ourselves as HTTP/1.0 not HTTP/1.1 (This used to be commit
 b2210614e810c8e84c9a14a8e32e05f95d92479b)

---
 source3/web/cgi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index bf99a67a04..38be0de3c6 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -251,7 +251,7 @@ tell a browser about a fatal error in the http processing
   ***************************************************************************/
 static void cgi_setup_error(char *err, char *header, char *info)
 {
-	printf("HTTP/1.1 %s\r\n%sConnection: close\r\nContent-Type: text/html\r\n\r\n<HTML><HEAD><TITLE>%s</TITLE></HEAD><BODY><H1>%s</H1>%s<p></BODY></HTML>\r\n", err, header, err, err, info);
+	printf("HTTP/1.0 %s\r\n%sConnection: close\r\nContent-Type: text/html\r\n\r\n<HTML><HEAD><TITLE>%s</TITLE></HEAD><BODY><H1>%s</H1>%s<p></BODY></HTML>\r\n", err, header, err, err, info);
 	exit(0);
 }
 
@@ -349,7 +349,7 @@ static void cgi_download(char *file)
 		cgi_setup_error("404 File Not Found","",
 				"The requested file was not found");
 	}
-	printf("HTTP/1.1 200 OK\r\n");
+	printf("HTTP/1.0 200 OK\r\n");
 	if ((p=strrchr(file,'.'))) {
 		if (strcmp(p,".gif")==0) {
 			printf("Content-Type: image/gif\r\n");
@@ -458,7 +458,7 @@ void cgi_setup(char *rootdir, int auth_required)
 		cgi_download(url);
 	}
 
-	printf("HTTP/1.1 200 OK\r\nConnection: close\r\n");
+	printf("HTTP/1.0 200 OK\r\nConnection: close\r\n");
 	printf("Date: %s\r\n", http_timestring(time(NULL)));
 	baseurl = "";
 	pathinfo = url+1;
-- 
cgit 


From fadde4210715322bac081e3665a73181d80059ab Mon Sep 17 00:00:00 2001
From: Herb Lewis <herb@samba.org>
Date: Wed, 11 Nov 1998 01:54:31 +0000
Subject: swat.c	updated to use new yodl generated smb.conf.5.html file for
 help added smb.conf.5.html to swat/help (This used to be commit
 9f250a80c66fb3e2b9039218771f0b4d5088a0ae)

---
 source3/web/swat.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 7a2f081d26..58915660dc 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -50,13 +50,25 @@ static char *fix_backslash(char *str)
 static char newstring[1024];
 char *p = newstring;
 
-	*p = '\0';
         while (*str) {
                 if (*str == '\\') {*p++ = '\\';*p++ = '\\';}
                 else *p++ = *str;
                 ++str;
-                *p = '\0';
         }
+	*p = '\0';
+	return newstring;
+}
+
+static char *stripspace(char *str)
+{
+static char newstring[1024];
+char *p = newstring;
+
+        while (*str) {
+                if (*str != ' ') *p++ = *str;
+                ++str;
+        }
+	*p = '\0';
 	return newstring;
 }
 
@@ -69,8 +81,8 @@ char *p = parmname;
 		if (*label == ' ') *p++ = '_';
 		else *p++ = *label;
 		++label;
-		*p = '\0';
 	}
+	*p = '\0';
 	return parmname;
 }
 
@@ -132,8 +144,8 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		ptr = lp_local_ptr(snum, ptr);
 	}
 
-	printf("<tr><td><A HREF=\"/swat/help/parameters.html#%s\">?</A> %s</td><td>", 
-	       parm->label, parm->label);
+	printf("<tr><td><A HREF=\"/swat/help/smb.conf.5.html#%s\">?</A> %s</td><td>", 
+	       stripspace(parm->label), parm->label);
 
 	switch (parm->type) {
 	case P_CHAR:
-- 
cgit 


From 6559aa10d55dd7a71e3b7c7cdee1ff3c7a58ac37 Mon Sep 17 00:00:00 2001
From: Herb Lewis <herb@samba.org>
Date: Wed, 11 Nov 1998 21:37:44 +0000
Subject: added password change functionality to swat (This used to be commit
 06d4026cf1521766b52766193774f1fd8dd70c81)

---
 source3/web/cgi.c  |  39 +++-
 source3/web/swat.c | 555 +++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 534 insertions(+), 60 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 38be0de3c6..a11abe074e 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -44,6 +44,7 @@ static int request_post;
 static char *query_string;
 static char *baseurl;
 static char *pathinfo;
+static char *C_user;
 
 static void unescape(char *buf)
 {
@@ -311,16 +312,32 @@ static int cgi_handle_authorization(char *line)
 	user = line;
 	pass = p+1;
 
-	/* currently only allow connections as root */
-	if (strcmp(user,"root")) {
-		cgi_setup_error("401 Bad Authorization", "", 
-				"incorrect username/password");
-	}
-
+	/* Save the users name */
+	C_user = strdup(user);
 
 	return pass_check(user, pass, strlen(pass), NULL, NULL);
 }
 
+/***************************************************************************
+is this root?
+  ***************************************************************************/
+BOOL is_root()
+{
+	if ((C_user) && (strcmp(C_user,"root") == 0)) {
+		return( True);
+	} else {
+		return( False);
+	}
+}
+
+/***************************************************************************
+return a ptr to the users name
+  ***************************************************************************/
+char * get_user_name()
+{
+        return(C_user);
+}
+
 
 /***************************************************************************
 handle a file download
@@ -390,6 +407,16 @@ void cgi_setup(char *rootdir, int auth_required)
 	}
 
 	if (getenv("CONTENT_LENGTH") || getenv("REQUEST_METHOD")) {
+
+		char *x;
+
+		/* Save the users name if available */
+		if (x = getenv("REMOTE_USER")) {
+			C_user = strdup(x);
+		} else {
+			C_user = "";
+		}
+
 		/* assume we are running under a real web server */
 		return;
 	}
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 58915660dc..81dca8fc04 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -30,6 +30,16 @@
 
 static pstring servicesf = CONFIGFILE;
 
+/*
+ * Password Management Globals
+ */
+char user[] = "username";
+char old_pswd[] = "old_passwd";
+char new_pswd[] = "new_passwd";
+char new2_pswd[] = "new2_passwd";
+char chg_passwd_flag[] = "chg_passwd_flag";
+char add_user_flag[] = "add_user_flag";
+char disable_user_flag[] = "disable_user_flag";
 
 /* we need these because we link to locking*.o */
  void become_root(BOOL save_dir) {}
@@ -37,6 +47,8 @@ static pstring servicesf = CONFIGFILE;
 /* We need this because we link to password.o */
 BOOL change_oem_password(struct smb_passwd *smbpw, char *new_passwd, BOOL override) {return False;}
 
+/****************************************************************************
+****************************************************************************/
 static int enum_index(int value, struct enum_list *enumlist)
 {
 int i;
@@ -86,8 +98,9 @@ char *p = parmname;
 	return parmname;
 }
 
-
-/* include a lump of html in a page */
+/****************************************************************************
+  include a lump of html in a page 
+****************************************************************************/
 static int include_html(char *fname)
 {
 	FILE *f = fopen(fname,"r");
@@ -109,7 +122,9 @@ static int include_html(char *fname)
 	return 1;
 }
 
-/* start the page with standard stuff */
+/****************************************************************************
+  start the page with standard stuff 
+****************************************************************************/
 static void print_header(void)
 {
 	if (!cgi_waspost()) {
@@ -123,8 +138,9 @@ static void print_header(void)
 	}
 }
 
-
-/* finish off the page */
+/****************************************************************************
+ finish off the page 
+****************************************************************************/
 static void print_footer(void)
 {
 	if (!include_html("include/footer.html")) {
@@ -132,9 +148,9 @@ static void print_footer(void)
 	}
 }
 
-
-
-/* display one editable parameter in a form */
+/****************************************************************************
+  display one editable parameter in a form 
+****************************************************************************/
 static void show_parameter(int snum, struct parm_struct *parm)
 {
 	int i;
@@ -215,7 +231,9 @@ static void show_parameter(int snum, struct parm_struct *parm)
 	printf("</td></tr>\n");
 }
 
-/* display a set of parameters for a service */
+/****************************************************************************
+  display a set of parameters for a service 
+****************************************************************************/
 static void show_parameters(int snum, int allparameters, int advanced, int printers)
 {
 	int i = 0;
@@ -278,8 +296,9 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 	}
 }
 
-
-/* write a config file */
+/****************************************************************************
+  write a config file 
+****************************************************************************/
 static void write_config(FILE *f, BOOL show_defaults)
 {
 	fprintf(f, "# Samba config file created using SWAT\n");
@@ -289,8 +308,9 @@ static void write_config(FILE *f, BOOL show_defaults)
 	lp_dump(f, show_defaults);	
 }
 
-
-/* save and reoad the smb.conf config file */
+/****************************************************************************
+  save and reoad the smb.conf config file 
+****************************************************************************/
 static int save_reload(void)
 {
 	FILE *f;
@@ -314,9 +334,9 @@ static int save_reload(void)
 	return 1;
 }
 
-
-
-/* commit one parameter */
+/****************************************************************************
+  commit one parameter 
+****************************************************************************/
 static void commit_parameter(int snum, struct parm_struct *parm, char *v)
 {
 	int i;
@@ -337,7 +357,9 @@ static void commit_parameter(int snum, struct parm_struct *parm, char *v)
 	lp_do_parameter(snum, parm->label, v);
 }
 
-/* commit a set of parameters for a service */
+/****************************************************************************
+  commit a set of parameters for a service 
+****************************************************************************/
 static void commit_parameters(int snum)
 {
 	int i = 0;
@@ -354,8 +376,9 @@ static void commit_parameters(int snum)
 	}
 }
 
-
-/* load the smb.conf file into loadparm. */
+/****************************************************************************
+  load the smb.conf file into loadparm.
+****************************************************************************/
 static void load_config(void)
 {
 	if (!lp_load(servicesf,False,True,False)) {
@@ -364,37 +387,49 @@ static void load_config(void)
 	}
 }
 
-/* spit out the html for a link with an image */
-static void image_link(char *name,char *hlink, char *src, int width, int height)
+/****************************************************************************
+  spit out the html for a link with an image 
+****************************************************************************/
+static void image_link(char *name,char *hlink, char *src)
 {
-	printf("<A HREF=\"%s/%s\"><img width=%d height=%d src=\"/swat/%s\" alt=\"%s\"></A>\n", 
-	       cgi_baseurl(),
-	       hlink, width, height, 
-	       src, name);
+	printf("<A HREF=\"%s/%s\"><img src=\"/swat/%s\" alt=\"%s\"></A>\n", 
+	       cgi_baseurl(), hlink, src, name);
 }
 
-/* display the main navigation controls at the top of each page along
-   with a title */
+/****************************************************************************
+  display the main navigation controls at the top of each page along
+  with a title 
+****************************************************************************/
 static void show_main_buttons(void)
 {
-	image_link("Home", "", "images/home.gif", 50, 50);
-	image_link("Globals", "globals", "images/globals.gif", 50, 50);
-	image_link("Shares", "shares", "images/shares.gif", 50, 50);
-	image_link("Printers", "printers", "images/printers.gif", 50, 50);
-	image_link("Status", "status", "images/status.gif", 50, 50);
-	image_link("View Config", "viewconfig", "images/viewconfig.gif", 50, 50);
+	image_link("Home", "", "images/home.gif");
+
+	/* Root gets full functionality */
+	if ( is_root() == True) {
+		image_link("Globals", "globals", "images/globals.gif");
+		image_link("Shares", "shares", "images/shares.gif");
+		image_link("Printers", "printers", "images/printers.gif");
+		image_link("Status", "status", "images/status.gif");
+		image_link("View Config", "viewconfig","images/viewconfig.gif");
+	}
+
+	/* Everyone gets this functionality */
+	image_link("Password Management", "passwd", "images/passwd.gif");
 
 	printf("<HR>\n");
 }
 
-/* display a welcome page  */
+/****************************************************************************
+  display a welcome page  
+****************************************************************************/
 static void welcome_page(void)
 {
 	include_html("help/welcome.html");
 }
 
-
-/* display the current smb.conf  */
+/****************************************************************************
+  display the current smb.conf  
+****************************************************************************/
 static void viewconfig_page(void)
 {
 	int full_view=0;
@@ -418,8 +453,9 @@ static void viewconfig_page(void)
 	printf("</form>\n");
 }
 
-
-/* display a globals editing page  */
+/****************************************************************************
+  display a globals editing page  
+****************************************************************************/
 static void globals_page(void)
 {
 	int advanced = 0;
@@ -456,7 +492,9 @@ static void globals_page(void)
 	printf("</FORM>\n");
 }
 
-/* display a shares editing page  */
+/****************************************************************************
+  display a shares editing page  
+****************************************************************************/
 static void shares_page(void)
 {
 	char *share = cgi_variable("share");
@@ -537,8 +575,405 @@ static void shares_page(void)
 	printf("</FORM>\n");
 }
 
+/****************************************************************************
+****************************************************************************/
+static void sig_pipe ( int signo)
+{
+	printf("<p> SIGPIPE caught\n");
+}
+
+/****************************************************************************
+  create 2 pipes and use them to feed the smbpasswd program 
+****************************************************************************/
+static BOOL talk_to_smbpasswd(char *old, char *new)
+{
+	int 	i, n, fd1[2], fd2[2];
+	pid_t	pid;
+	BOOL	rslt;
+	char	line[MAX_STRINGLEN + 2]; /* one for newline, one for null */
+
+	if (signal(SIGPIPE, sig_pipe) == SIG_ERR) {
+		printf("<p> signal error");
+	}
+
+	if ((pipe(fd1) < 0) || (pipe(fd2) < 0)) {
+		printf("<p> pipe error");
+	}
+
+	if ((pid = fork()) < 0) {
+		printf("<p> fork error");
+	}
+
+	/*
+	 * Create this relationship with the pipes between the parent and 
+	 * the child as detailed below.
+	 *
+	 * parent -> fd1[1] -- fd1[0] -> child 
+	 * parent <- fd2[0] -- fd2[1] <- child 
+	 *
+	 * fd1[0] is turned into child's stdin
+	 * fd2[1] is turned into child's stdout
+	 * fd2[1] is also turned into child's stderr
+	 *
+	 */
+	else if (pid > 0) {			/* parent */
+
+		int	to_child    = fd1[1];
+		int	from_child  = fd2[0];
+		int	wstat;
+		pid_t	wpid;
+
+		close(fd1[0]); /* parent doesn't need input  side of pipe fd1 */
+		close(fd2[1]); /* parent doesn't need output side of pipe fd2 */
+
+		/*
+		 * smbpasswd doesn't require any input to disable a user 
+		 */
+		if (cgi_variable(disable_user_flag)) {
+			/*
+			 * smbpasswd requires a regular old user to send their old password 
+			 */
+			if ( is_root() == False) {
+				n = (strlen(old) <= (MAX_STRINGLEN)) ? strlen(old) : (MAX_STRINGLEN);
+				strncpy( line, old, n);
+				line[n] = '\n'; n++; /* add carriage return */
+				line[n] =    0;      /* add null terminator, for debug */
+				if (write( to_child, line, n) != n) {
+					printf("<p> error on write to child");
+				}
+			}
+
+			/*
+			 * smbpasswd requires that the new password be sent to it twice
+			 */
+			for( i=0; i<2; i++) {
+				n = (strlen(new) <= (MAX_STRINGLEN)) ? strlen(new) : (MAX_STRINGLEN);
+				strncpy( line, new, n);
+				line[n] = '\n'; n++; /* add carriage return */
+				line[n] =    0;      /* add null terminator, for debug */
+				if (write( to_child, line, n) != n) {
+					printf("<p> error on write to child");
+					break;
+				}
+			}
+		}
+
+		/*
+		 * Wait for smbpasswd to finish
+		 */
+		if ((wpid = sys_waitpid(pid, &wstat, 0)) < 0) {
+			printf("<p> problem waiting");
+		}
+
+		/* 
+		 * Read the answer from the add program
+		 */
+		memset( line, '\0', sizeof(line));
+		if ((n = read( from_child, line, MAX_STRINGLEN)) < 0) {
+			printf("<p> error on read from child");
+		}
 
-/* display a printers editing page  */
+		/*
+		 * Write the response from smbpasswd to user, if all is well
+		 * line[] should be just a null terminated line. We could 
+		 * check for the null line and not print anything, but we 
+		 * really should be checking the exit code if we want to be 
+		 * sure.
+		 */
+		line[n] = 0;    /* null terminate */
+		printf("<p> %s\n",line);
+	
+		close(to_child); 
+		close(from_child); 
+	
+		if (line[0] == '\0') {
+			rslt = True;   /* All ok */
+		} else {
+			rslt = False;  /* Something didn't work */
+		}
+		
+	} else {				/* child  */
+
+		int	from_parent  = fd1[0];
+		int	to_parent    = fd2[1];
+
+		close(fd1[1]); /* child  doesn't need output side of pipe fd1 */
+		close(fd2[0]); /* child  doesn't need input  side of pipe fd2 */
+
+		/*
+		 * Turn the from_parent pipe into the childs stdin 
+		 */
+		if (from_parent != STDIN_FILENO) {
+			if (dup2( from_parent, STDIN_FILENO) != STDIN_FILENO) {
+				printf("<p> dup2 error of stdin");
+			}
+			close( from_parent);
+		}
+
+		/*
+		 * Turn the to_parent pipe into the childs stdout
+		 */
+		if (to_parent != STDOUT_FILENO) {
+			if (dup2( to_parent, STDOUT_FILENO) != STDOUT_FILENO) {
+				printf("<p> dup2 error of stdout");
+			}
+			close( to_parent);
+		}
+		/*
+		 * Make the childs stderr the to_parent pipe also
+		 */
+		if (dup2( STDOUT_FILENO, STDERR_FILENO) != STDERR_FILENO) {
+			printf("<p> dup2 error of stdout");
+		}
+
+		
+		/* Root can do more */
+		if (is_root() == True) {
+			if (cgi_variable(add_user_flag)) {
+				/* 
+				 * Add a user 
+				 */
+				if (execl(SMB_PASSWD_PROGRAM, "smbpasswd", "-s", "-a", cgi_variable(user), (char *) 0) < 0) {
+					printf("<p> execl error of smbpasswd");
+				}
+			} else if (cgi_variable(disable_user_flag)) {
+				/* 
+				 * Disable a user 
+				 */
+				if (execl(SMB_PASSWD_PROGRAM, "smbpasswd", "-s", "-d", cgi_variable(user), (char *) 0) < 0) {
+					printf("<p> execl error of smbpasswd");
+				}
+			} else {
+				/* 
+			 	 * Change a users password 
+				 */
+				if (execl(SMB_PASSWD_PROGRAM, "smbpasswd", "-s", cgi_variable(user), (char *) 0) < 0) {
+					printf("<p> execl error of smbpasswd");
+				}
+			}
+		} else {
+			/* 
+		 	 * Ordinary users can change any users passwd if they know the old passwd
+			 */
+			if (execl(SMB_PASSWD_PROGRAM, "smbpasswd", "-s", (char *) 0) < 0) {
+				printf("<p> execl error of smbpasswd");
+			}
+		}
+	}
+	return(rslt);  
+}
+
+/****************************************************************************
+  become the specified uid
+****************************************************************************/
+static BOOL become_uid(uid_t uid)
+{
+#ifdef HAVE_TRAPDOOR_UID
+#ifdef HAVE_SETUIDX
+	/* AIX3 has setuidx which is NOT a trapoor function (tridge) */
+	if (setuidx(ID_EFFECTIVE, uid) != 0) {
+		if (seteuid(uid) != 0) {
+			printf("<p> Can't set uid %d (setuidx)\n", (int)uid);
+			return False;
+		}
+	}
+#endif
+#endif
+
+#ifdef HAVE_SETRESUID
+	if (setresuid(-1,uid,-1) != 0)
+#else
+	if ((seteuid(uid) != 0) && (setuid(uid) != 0))
+#endif
+	{
+		printf("<p> Couldn't set uid %d currently set to (uid %d, euid %d)\n",
+			(int)uid,(int)getuid(), (int)geteuid());
+		if (uid > (uid_t)32000) {
+			printf("<p> Looks like your OS doesn't like high uid values - try using a different account\n");
+
+		}
+		return(False);
+	}
+
+	if (((uid == (uid_t)-1) || ((sizeof(uid_t) == 2) && (uid == 65535))) &&
+            (geteuid() != uid)) {
+		printf("<p> Invalid uid -1. perhaps you have a account with uid 65535?\n");
+		return(False);
+	}
+
+	return(True);
+}
+
+/****************************************************************************
+  become the specified gid
+****************************************************************************/
+static BOOL become_gid(gid_t gid)
+{
+#ifdef HAVE_SETRESUID
+	if (setresgid(-1,gid,-1) != 0)
+#else
+	if (setgid(gid) != 0)
+#endif
+	{
+		printf("<p> Couldn't set gid %d currently set to (gid %d, egid %d)\n",
+                 (int)gid,(int)getgid(),(int)getegid());
+		if (gid > 32000) {
+			printf("<p> Looks like your OS doesn't like high gid values - try using a different account\n");
+		}
+		return(False);
+	}
+
+	return(True);
+}
+
+/****************************************************************************
+  become the specified uid and gid
+****************************************************************************/
+static BOOL become_id(uid_t uid,gid_t gid)
+{
+	return(become_gid(gid) && become_uid(uid));
+}
+
+/****************************************************************************
+  do the stuff required to add or change a password 
+****************************************************************************/
+static void chg_passwd(void)
+{
+	char *s;
+	struct passwd *pass = NULL;
+	BOOL rslt;
+
+	/* Make sure users name has been specified */
+	if (strlen(cgi_variable(user)) == 0) {
+		printf("<p> Must specify \"User Name\" \n");
+		return;
+	}
+
+	/*
+	 * smbpasswd doesn't require anything but the users name to disable the user,
+	 * so if that's what we're doing, skip the rest of the checks
+	 */
+	if (!cgi_variable(disable_user_flag)) {
+
+		/* If current user is not root, make sure old password has been specified */
+		if ((is_root() == False) &&  (strlen( cgi_variable(old_pswd)) <= 0)) {
+			printf("<p> Must specify \"Old Password\" \n");
+			return;
+		}
+
+		/* Make sure new passwords have been specified */
+		if ((strlen( cgi_variable(new_pswd )) <= 0) ||
+		    (strlen( cgi_variable(new2_pswd)) <= 0)) {
+			printf("<p> Must specify \"New, and Re-typed Passwords\" \n");
+			return;
+		}
+
+		/* Make sure new passwords was typed correctly twice */
+		if (strcmp(cgi_variable(new_pswd), cgi_variable(new2_pswd)) != 0) {
+			printf("<p> Re-typed password didn't match new password\n");
+			return;
+		}
+	}
+
+	/* Get the UID/GID of the user, and become that user  */
+	if (is_root() == False) {
+		pass = Get_Pwnam(cgi_variable(user),True);
+		if (pass == NULL) {
+			printf("<p> User uid unknown     \n");
+		} else {
+			if (become_id(pass->pw_uid, pass->pw_gid) == False) {
+				printf("<p> uid/gid set failed \n");
+				return;
+			}
+		}
+	}
+
+#ifndef SWAT_DEBUG
+	if (pass) printf("<p> User uid %d  gid %d \n", pass->pw_uid, pass->pw_gid);
+	printf("<p> Processes uid %d, euid %d, gid %d, egid %d \n",getuid(),geteuid(),getgid(),getegid());
+	printf("<p> User Name %s     \n", cgi_variable(user));
+	printf("<p> Old passwd %s    \n", cgi_variable(old_pswd) ? cgi_variable(old_pswd):"");
+	printf("<p> New passwd %s    \n", cgi_variable(new_pswd));
+	printf("<p> Re-typed New passwd %s    \n", cgi_variable(new2_pswd));
+	printf("<p> flags '%s', '%s', '%s'   \n", 
+		(cgi_variable( chg_passwd_flag) ? cgi_variable( chg_passwd_flag) : ""),
+		(cgi_variable( add_user_flag) ? cgi_variable( add_user_flag) : ""),
+		(cgi_variable( disable_user_flag) ? cgi_variable( disable_user_flag) : ""));
+#endif /* SWAT_DEBUG */
+
+
+	rslt = talk_to_smbpasswd( cgi_variable(old_pswd), cgi_variable(new_pswd));
+	if (is_root() == False) {
+		if (rslt == True) {
+			printf("<p> The passwd for '%s' has been changed. \n",cgi_variable(user));
+		} else {
+			printf("<p> The passwd for '%s' has NOT been changed. \n",cgi_variable(user));
+		}
+	}
+	
+	return;
+}
+
+/****************************************************************************
+  display a password editing page  
+****************************************************************************/
+static void passwd_page(void)
+{
+	char *s, *new_name;
+	int i;
+	extern char * get_user_name();
+
+	printf("<H2>Password Manager</H2>\n");
+
+	printf("<FORM name=\"swatform\" method=post>\n");
+
+	printf("<table>\n");
+
+	/* 
+	 * After the first time through here be nice. If the user
+	 * changed the User box text to another users name, remember it.
+	 */
+	if ( cgi_variable(user) && 
+	    (strcmp(cgi_variable(user), get_user_name()))) {
+		/* User is changing another accounts passwd */
+		new_name = cgi_variable(user);
+	} else {
+		/* User is changing there own passwd */
+		new_name = get_user_name();
+	}
+
+	printf("<p> User Name        : <input type=text size=30 name=%s value=%s> \n", user, new_name);
+	if (is_root() == False) {
+		printf("<p> Old Password: <input type=password size=30 name=%s>\n",old_pswd);
+	}
+	printf("<p> New Password: <input type=password size=30 name=%s>\n",new_pswd);
+	printf("<p> Re-type New Password: <input type=password size=30 name=%s>\n",new2_pswd);
+
+	printf("</select></td></tr><p>");
+	printf("<tr><td>");
+	printf("<input type=submit name=%s value=\"Change Password\">", chg_passwd_flag);
+	if (is_root() == True) {
+		printf("<input type=submit name=%s value=\"Add New User\">", add_user_flag);
+		printf("<input type=submit name=%s value=\"Disable User\">", disable_user_flag);
+	}
+	printf("</td>\n");
+
+	/*
+	 * If we don't have user information then there's nothing to do. It's probably
+	 * the first time through this code.
+	 */
+	if (s = cgi_variable(user)) {
+		chg_passwd();		
+	}
+
+	printf("</table>");
+
+	printf("</FORM>\n");
+}
+
+/****************************************************************************
+  display a printers editing page  
+****************************************************************************/
 static void printers_page(void)
 {
 	char *share = cgi_variable("share");
@@ -621,8 +1056,9 @@ static void printers_page(void)
 	printf("</FORM>\n");
 }
 
-
-
+/****************************************************************************
+  MAIN()
+****************************************************************************/
  int main(int argc, char *argv[])
 {
 	extern char *optarg;
@@ -667,22 +1103,33 @@ static void printers_page(void)
 
 	page = cgi_pathinfo();
 
-	if (strcmp(page, "globals")==0) {
-		globals_page();
-	} else if (strcmp(page,"shares")==0) {
-		shares_page();
-	} else if (strcmp(page,"printers")==0) {
-		printers_page();
-	} else if (strcmp(page,"status")==0) {
-		status_page();
-	} else if (strcmp(page,"viewconfig")==0) {
-		viewconfig_page();
+	/* Root gets full functionality */
+	if ( is_root() == True) {
+		if (strcmp(page, "globals")==0) {
+			globals_page();
+		} else if (strcmp(page,"shares")==0) {
+			shares_page();
+		} else if (strcmp(page,"printers")==0) {
+			printers_page();
+		} else if (strcmp(page,"status")==0) {
+			status_page();
+		} else if (strcmp(page,"viewconfig")==0) {
+			viewconfig_page();
+		} else if (strcmp(page,"passwd")==0) {
+			passwd_page();
+		} else {
+			welcome_page();
+		}
 	} else {
-		welcome_page();
+		/* Everyone gets this functionality */
+		if (strcmp(page,"passwd")==0) {
+			passwd_page();
+		} else {
+			welcome_page();
+		}
 	}
 	
 	print_footer();
 	return 0;
 }
 
-
-- 
cgit 


From f49b994aeb987ac87c3c49f35ae1e05a7004f75d Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 11 Nov 1998 23:25:51 +0000
Subject: rpc_server/srv_netlog.c: Fixed crash bug with ACB_PWNOTREQ.
 script/makeyodldocs.sh: Added code to make text docs for non-man page YODL
 docs. web/cgi.c web/swat.c: SGI compiler warnings fixed. Jeremy. (This used
 to be commit 80e0f7e1071f032c5004aecb01a91d1397e6a161)

---
 source3/web/cgi.c  | 4 ++--
 source3/web/swat.c | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index a11abe074e..86366d1083 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -321,7 +321,7 @@ static int cgi_handle_authorization(char *line)
 /***************************************************************************
 is this root?
   ***************************************************************************/
-BOOL is_root()
+BOOL is_root(void)
 {
 	if ((C_user) && (strcmp(C_user,"root") == 0)) {
 		return( True);
@@ -333,7 +333,7 @@ BOOL is_root()
 /***************************************************************************
 return a ptr to the users name
   ***************************************************************************/
-char * get_user_name()
+char *get_user_name(void)
 {
         return(C_user);
 }
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 81dca8fc04..da032e077d 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -621,7 +621,6 @@ static BOOL talk_to_smbpasswd(char *old, char *new)
 		int	to_child    = fd1[1];
 		int	from_child  = fd2[0];
 		int	wstat;
-		pid_t	wpid;
 
 		close(fd1[0]); /* parent doesn't need input  side of pipe fd1 */
 		close(fd2[1]); /* parent doesn't need output side of pipe fd2 */
@@ -661,7 +660,7 @@ static BOOL talk_to_smbpasswd(char *old, char *new)
 		/*
 		 * Wait for smbpasswd to finish
 		 */
-		if ((wpid = sys_waitpid(pid, &wstat, 0)) < 0) {
+		if (sys_waitpid(pid, &wstat, 0) < 0) {
 			printf("<p> problem waiting");
 		}
 
@@ -919,9 +918,8 @@ static void chg_passwd(void)
 ****************************************************************************/
 static void passwd_page(void)
 {
-	char *s, *new_name;
+	char *new_name;
 	int i;
-	extern char * get_user_name();
 
 	printf("<H2>Password Manager</H2>\n");
 
@@ -962,7 +960,7 @@ static void passwd_page(void)
 	 * If we don't have user information then there's nothing to do. It's probably
 	 * the first time through this code.
 	 */
-	if (s = cgi_variable(user)) {
+	if (cgi_variable(user)) {
 		chg_passwd();		
 	}
 
-- 
cgit 


From f9584f93be33ee69912708e6402809f47703a5d5 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 11 Nov 1998 23:31:37 +0000
Subject: J.F.'s latest printer fixes plus his gcc -picky fix for web/cgi.c
 Jeremy. (This used to be commit bd4e2972f50cafd932a5c915cdeeef7eedda07cc)

---
 source3/web/cgi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 86366d1083..41d099bac9 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -411,7 +411,7 @@ void cgi_setup(char *rootdir, int auth_required)
 		char *x;
 
 		/* Save the users name if available */
-		if (x = getenv("REMOTE_USER")) {
+		if ((x = getenv("REMOTE_USER"))!=NULL) {
 			C_user = strdup(x);
 		} else {
 			C_user = "";
-- 
cgit 


From 01ceb5e2d7b7b4492ed3f2bd1e95fe9b4d68ad47 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 11 Nov 1998 23:47:03 +0000
Subject: changed is_root() to am_root() to prevent clash with variable names.
 (This used to be commit 52f47b8d2ef5ee64e2f8dcfeb6840071e57904d1)

---
 source3/web/cgi.c  |  4 ++--
 source3/web/swat.c | 20 +++++++++-----------
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 41d099bac9..5415abf6b3 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -321,7 +321,7 @@ static int cgi_handle_authorization(char *line)
 /***************************************************************************
 is this root?
   ***************************************************************************/
-BOOL is_root(void)
+BOOL am_root(void)
 {
 	if ((C_user) && (strcmp(C_user,"root") == 0)) {
 		return( True);
@@ -411,7 +411,7 @@ void cgi_setup(char *rootdir, int auth_required)
 		char *x;
 
 		/* Save the users name if available */
-		if ((x = getenv("REMOTE_USER"))!=NULL) {
+		if ((x = getenv("REMOTE_USER"))) {
 			C_user = strdup(x);
 		} else {
 			C_user = "";
diff --git a/source3/web/swat.c b/source3/web/swat.c
index da032e077d..038829337d 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -405,7 +405,7 @@ static void show_main_buttons(void)
 	image_link("Home", "", "images/home.gif");
 
 	/* Root gets full functionality */
-	if ( is_root() == True) {
+	if (am_root() == True) {
 		image_link("Globals", "globals", "images/globals.gif");
 		image_link("Shares", "shares", "images/shares.gif");
 		image_link("Printers", "printers", "images/printers.gif");
@@ -632,7 +632,7 @@ static BOOL talk_to_smbpasswd(char *old, char *new)
 			/*
 			 * smbpasswd requires a regular old user to send their old password 
 			 */
-			if ( is_root() == False) {
+			if (am_root() == False) {
 				n = (strlen(old) <= (MAX_STRINGLEN)) ? strlen(old) : (MAX_STRINGLEN);
 				strncpy( line, old, n);
 				line[n] = '\n'; n++; /* add carriage return */
@@ -727,7 +727,7 @@ static BOOL talk_to_smbpasswd(char *old, char *new)
 
 		
 		/* Root can do more */
-		if (is_root() == True) {
+		if (am_root() == True) {
 			if (cgi_variable(add_user_flag)) {
 				/* 
 				 * Add a user 
@@ -838,7 +838,6 @@ static BOOL become_id(uid_t uid,gid_t gid)
 ****************************************************************************/
 static void chg_passwd(void)
 {
-	char *s;
 	struct passwd *pass = NULL;
 	BOOL rslt;
 
@@ -855,7 +854,7 @@ static void chg_passwd(void)
 	if (!cgi_variable(disable_user_flag)) {
 
 		/* If current user is not root, make sure old password has been specified */
-		if ((is_root() == False) &&  (strlen( cgi_variable(old_pswd)) <= 0)) {
+		if ((am_root() == False) &&  (strlen( cgi_variable(old_pswd)) <= 0)) {
 			printf("<p> Must specify \"Old Password\" \n");
 			return;
 		}
@@ -875,7 +874,7 @@ static void chg_passwd(void)
 	}
 
 	/* Get the UID/GID of the user, and become that user  */
-	if (is_root() == False) {
+	if (am_root() == False) {
 		pass = Get_Pwnam(cgi_variable(user),True);
 		if (pass == NULL) {
 			printf("<p> User uid unknown     \n");
@@ -902,7 +901,7 @@ static void chg_passwd(void)
 
 
 	rslt = talk_to_smbpasswd( cgi_variable(old_pswd), cgi_variable(new_pswd));
-	if (is_root() == False) {
+	if (am_root() == False) {
 		if (rslt == True) {
 			printf("<p> The passwd for '%s' has been changed. \n",cgi_variable(user));
 		} else {
@@ -919,7 +918,6 @@ static void chg_passwd(void)
 static void passwd_page(void)
 {
 	char *new_name;
-	int i;
 
 	printf("<H2>Password Manager</H2>\n");
 
@@ -941,7 +939,7 @@ static void passwd_page(void)
 	}
 
 	printf("<p> User Name        : <input type=text size=30 name=%s value=%s> \n", user, new_name);
-	if (is_root() == False) {
+	if (am_root() == False) {
 		printf("<p> Old Password: <input type=password size=30 name=%s>\n",old_pswd);
 	}
 	printf("<p> New Password: <input type=password size=30 name=%s>\n",new_pswd);
@@ -950,7 +948,7 @@ static void passwd_page(void)
 	printf("</select></td></tr><p>");
 	printf("<tr><td>");
 	printf("<input type=submit name=%s value=\"Change Password\">", chg_passwd_flag);
-	if (is_root() == True) {
+	if (am_root() == True) {
 		printf("<input type=submit name=%s value=\"Add New User\">", add_user_flag);
 		printf("<input type=submit name=%s value=\"Disable User\">", disable_user_flag);
 	}
@@ -1102,7 +1100,7 @@ static void printers_page(void)
 	page = cgi_pathinfo();
 
 	/* Root gets full functionality */
-	if ( is_root() == True) {
+	if (am_root() == True) {
 		if (strcmp(page, "globals")==0) {
 			globals_page();
 		} else if (strcmp(page,"shares")==0) {
-- 
cgit 


From 85dde8c7cb56614ec32f58af50ddf73460b6c0ba Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 12 Nov 1998 01:22:07 +0000
Subject: Added enable user button. Fixed bug where log was always printed.
 Jeremy. (This used to be commit 43ddc857793ffe507017fc989d60403e33e2ada3)

---
 source3/web/swat.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 038829337d..1030689f18 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -40,6 +40,7 @@ char new2_pswd[] = "new2_passwd";
 char chg_passwd_flag[] = "chg_passwd_flag";
 char add_user_flag[] = "add_user_flag";
 char disable_user_flag[] = "disable_user_flag";
+char enable_user_flag[] = "enable_user_flag";
 
 /* we need these because we link to locking*.o */
  void become_root(BOOL save_dir) {}
@@ -626,9 +627,9 @@ static BOOL talk_to_smbpasswd(char *old, char *new)
 		close(fd2[1]); /* parent doesn't need output side of pipe fd2 */
 
 		/*
-		 * smbpasswd doesn't require any input to disable a user 
+		 * smbpasswd doesn't require any input to disable or enable a user 
 		 */
-		if (cgi_variable(disable_user_flag)) {
+		if (!cgi_variable(disable_user_flag) && !cgi_variable(enable_user_flag)) {
 			/*
 			 * smbpasswd requires a regular old user to send their old password 
 			 */
@@ -742,6 +743,13 @@ static BOOL talk_to_smbpasswd(char *old, char *new)
 				if (execl(SMB_PASSWD_PROGRAM, "smbpasswd", "-s", "-d", cgi_variable(user), (char *) 0) < 0) {
 					printf("<p> execl error of smbpasswd");
 				}
+			} else if (cgi_variable(enable_user_flag)) {
+				/* 
+				 * Enable a user 
+				 */
+				if (execl(SMB_PASSWD_PROGRAM, "smbpasswd", "-s", "-e", cgi_variable(user), (char *) 0) < 0) {
+					printf("<p> execl error of smbpasswd");
+				}
 			} else {
 				/* 
 			 	 * Change a users password 
@@ -848,10 +856,10 @@ static void chg_passwd(void)
 	}
 
 	/*
-	 * smbpasswd doesn't require anything but the users name to disable the user,
+	 * smbpasswd doesn't require anything but the users name to disable or enable the user,
 	 * so if that's what we're doing, skip the rest of the checks
 	 */
-	if (!cgi_variable(disable_user_flag)) {
+	if (!cgi_variable(disable_user_flag) && !cgi_variable(enable_user_flag)) {
 
 		/* If current user is not root, make sure old password has been specified */
 		if ((am_root() == False) &&  (strlen( cgi_variable(old_pswd)) <= 0)) {
@@ -886,7 +894,7 @@ static void chg_passwd(void)
 		}
 	}
 
-#ifndef SWAT_DEBUG
+#ifdef SWAT_DEBUG
 	if (pass) printf("<p> User uid %d  gid %d \n", pass->pw_uid, pass->pw_gid);
 	printf("<p> Processes uid %d, euid %d, gid %d, egid %d \n",getuid(),geteuid(),getgid(),getegid());
 	printf("<p> User Name %s     \n", cgi_variable(user));
@@ -897,6 +905,7 @@ static void chg_passwd(void)
 		(cgi_variable( chg_passwd_flag) ? cgi_variable( chg_passwd_flag) : ""),
 		(cgi_variable( add_user_flag) ? cgi_variable( add_user_flag) : ""),
 		(cgi_variable( disable_user_flag) ? cgi_variable( disable_user_flag) : ""));
+		(cgi_variable( enable_user_flag) ? cgi_variable( enable_user_flag) : ""));
 #endif /* SWAT_DEBUG */
 
 
@@ -951,6 +960,7 @@ static void passwd_page(void)
 	if (am_root() == True) {
 		printf("<input type=submit name=%s value=\"Add New User\">", add_user_flag);
 		printf("<input type=submit name=%s value=\"Disable User\">", disable_user_flag);
+		printf("<input type=submit name=%s value=\"Enable User\">", enable_user_flag);
 	}
 	printf("</td>\n");
 
-- 
cgit 


From b0a2e2e77896aeeddbebcd748517dcf4a1230e50 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 12 Nov 1998 03:06:00 +0000
Subject: Added the security changes suggested by Andrew - become the user that
 authenticated to swat permanently (if not root). Jeremy. (This used to be
 commit 7d55bf379177a4a448e39577ae0af603d5e958f6)

---
 source3/web/cgi.c  |  70 ++++++++++++++++++++++++++++----
 source3/web/swat.c | 116 +++++++++++++++++++++--------------------------------
 2 files changed, 107 insertions(+), 79 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 5415abf6b3..9b5cf2158c 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -293,29 +293,83 @@ static void base64_decode(char *s)
 /***************************************************************************
 handle a http authentication line
   ***************************************************************************/
-static int cgi_handle_authorization(char *line)
+static BOOL cgi_handle_authorization(char *line)
 {
-	char *p, *user, *pass;
+	char *p, *user, *user_pass;
+	struct passwd *pass = NULL;
+	int ret = False;
 
 	if (strncasecmp(line,"Basic ", 6)) {
 		cgi_setup_error("401 Bad Authorization", "", 
 				"Only basic authorization is understood");
+		return False;
 	}
 	line += 6;
 	while (line[0] == ' ') line++;
 	base64_decode(line);
 	if (!(p=strchr(line,':'))) {
+		/*
+		 * Always give the same error so a cracker
+		 * cannot tell why we fail.
+		 */
 		cgi_setup_error("401 Bad Authorization", "", 
 				"username/password must be supplied");
+		return False;
 	}
 	*p = 0;
 	user = line;
-	pass = p+1;
+	user_pass = p+1;
+
+	/*
+	 * Try and get the user from the UNIX password file.
+	 */
+
+	if(!(pass = Get_Pwnam(user,False))) {
+		/*
+		 * Always give the same error so a cracker
+		 * cannot tell why we fail.
+		 */
+		cgi_setup_error("401 Bad Authorization", "",
+				"username/password must be supplied");
+		return False;
+	}
+
+	/*
+	 * Validate the password they have given.
+	 */
+
+	if((ret = pass_check(user, user_pass, strlen(user_pass), NULL, NULL)) == True) {
+
+		/*
+		 * Password was ok.
+		 */
+
+		if(pass->pw_uid != 0) {
+			/*
+			 * We have not authenticated as root,
+			 * become the user *permanently*.
+			 */
+			if(!become_user_permanently(pass->pw_uid, pass->pw_gid)) {
+				/*
+				 * Always give the same error so a cracker
+				 * cannot tell why we fail.
+				 */
+				cgi_setup_error("401 Bad Authorization", "",
+	                "username/password must be supplied");
+		        return False;
+			}
+
+			/*
+			 * On exit from here we are the authenticated
+			 * user - no way back.
+			 */
+		}
 
-	/* Save the users name */
-	C_user = strdup(user);
+		/* Save the users name */
+		C_user = strdup(user);
+	}
 
-	return pass_check(user, pass, strlen(pass), NULL, NULL);
+	return ret;
 }
 
 /***************************************************************************
@@ -323,7 +377,7 @@ is this root?
   ***************************************************************************/
 BOOL am_root(void)
 {
-	if ((C_user) && (strcmp(C_user,"root") == 0)) {
+	if (geteuid() == 0) {
 		return( True);
 	} else {
 		return( False);
@@ -393,7 +447,7 @@ run as a true cgi program by a web browser or is itself a mini web server
   ***************************************************************************/
 void cgi_setup(char *rootdir, int auth_required)
 {
-	int authenticated = 0;
+	BOOL authenticated = False;
 	char line[1024];
 	char *url=NULL;
 	char *p;
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 1030689f18..1ab90a3a3d 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -771,74 +771,62 @@ static BOOL talk_to_smbpasswd(char *old, char *new)
 }
 
 /****************************************************************************
-  become the specified uid
+  become the specified uid - permanently !
 ****************************************************************************/
-static BOOL become_uid(uid_t uid)
+
+BOOL become_user_permanently(uid_t uid, gid_t gid)
 {
-#ifdef HAVE_TRAPDOOR_UID
-#ifdef HAVE_SETUIDX
-	/* AIX3 has setuidx which is NOT a trapoor function (tridge) */
-	if (setuidx(ID_EFFECTIVE, uid) != 0) {
-		if (seteuid(uid) != 0) {
-			printf("<p> Can't set uid %d (setuidx)\n", (int)uid);
-			return False;
-		}
-	}
-#endif
-#endif
 
-#ifdef HAVE_SETRESUID
-	if (setresuid(-1,uid,-1) != 0)
-#else
-	if ((seteuid(uid) != 0) && (setuid(uid) != 0))
-#endif
-	{
-		printf("<p> Couldn't set uid %d currently set to (uid %d, euid %d)\n",
-			(int)uid,(int)getuid(), (int)geteuid());
-		if (uid > (uid_t)32000) {
-			printf("<p> Looks like your OS doesn't like high uid values - try using a different account\n");
+    if (geteuid() != 0) {
+        return(True);
+    }
 
-		}
-		return(False);
-	}
+    /* now completely lose our privilages. This is a fairly paranoid
+    way of doing it, but it does work on all systems that I know of */
 
-	if (((uid == (uid_t)-1) || ((sizeof(uid_t) == 2) && (uid == 65535))) &&
-            (geteuid() != uid)) {
-		printf("<p> Invalid uid -1. perhaps you have a account with uid 65535?\n");
-		return(False);
-	}
+#ifdef HAVE_SETRESUID
+	/*
+	 * Firstly ensure all our uids are set to root.
+	 */
+    setresgid(0,0,0);
+    setresuid(0,0,0);
 
-	return(True);
-}
+	/*
+	 * Now ensure we change all our gids.
+	 */
+    setresgid(gid,gid,gid);
 
-/****************************************************************************
-  become the specified gid
-****************************************************************************/
-static BOOL become_gid(gid_t gid)
-{
-#ifdef HAVE_SETRESUID
-	if (setresgid(-1,gid,-1) != 0)
+	/*
+	 * Now ensure all the uids are the user.
+	 */
+    setresuid(uid,uid,uid);
 #else
-	if (setgid(gid) != 0)
+	/*
+	 * Firstly ensure all our uids are set to root.
+	 */
+    setuid(0);
+    seteuid(0);
+
+	/*
+	 * Now ensure we change all our gids.
+	 */
+    setgid(gid);
+    setegid(gid);
+
+	/*
+	 * Now ensure all the uids are the user.
+	 */
+    setuid(uid);
+    seteuid(uid);
 #endif
-	{
-		printf("<p> Couldn't set gid %d currently set to (gid %d, egid %d)\n",
-                 (int)gid,(int)getgid(),(int)getegid());
-		if (gid > 32000) {
-			printf("<p> Looks like your OS doesn't like high gid values - try using a different account\n");
-		}
-		return(False);
-	}
 
-	return(True);
-}
+    if (getuid() != uid || geteuid() != uid ||
+        getgid() != gid || getegid() != gid) {
+        /* We failed to lose our privilages. */
+        return False;
+    }
 
-/****************************************************************************
-  become the specified uid and gid
-****************************************************************************/
-static BOOL become_id(uid_t uid,gid_t gid)
-{
-	return(become_gid(gid) && become_uid(uid));
+	return(True);
 }
 
 /****************************************************************************
@@ -881,19 +869,6 @@ static void chg_passwd(void)
 		}
 	}
 
-	/* Get the UID/GID of the user, and become that user  */
-	if (am_root() == False) {
-		pass = Get_Pwnam(cgi_variable(user),True);
-		if (pass == NULL) {
-			printf("<p> User uid unknown     \n");
-		} else {
-			if (become_id(pass->pw_uid, pass->pw_gid) == False) {
-				printf("<p> uid/gid set failed \n");
-				return;
-			}
-		}
-	}
-
 #ifdef SWAT_DEBUG
 	if (pass) printf("<p> User uid %d  gid %d \n", pass->pw_uid, pass->pw_gid);
 	printf("<p> Processes uid %d, euid %d, gid %d, egid %d \n",getuid(),geteuid(),getgid(),getegid());
@@ -1138,4 +1113,3 @@ static void printers_page(void)
 	print_footer();
 	return 0;
 }
-
-- 
cgit 


From 29e36b713468d7e7de301c483fc340ef42b4a9fb Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 12 Nov 1998 07:06:48 +0000
Subject: extracted the password change code from smbpasswd and used it in swat
 instead of opening pipes and other horrible stuff. (This used to be commit
 49bf19710345a59a2d17cd449be1a132885ed821)

---
 source3/web/swat.c | 353 ++++++++---------------------------------------------
 1 file changed, 54 insertions(+), 299 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 1ab90a3a3d..67582bc116 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -33,20 +33,18 @@ static pstring servicesf = CONFIGFILE;
 /*
  * Password Management Globals
  */
-char user[] = "username";
-char old_pswd[] = "old_passwd";
-char new_pswd[] = "new_passwd";
-char new2_pswd[] = "new2_passwd";
-char chg_passwd_flag[] = "chg_passwd_flag";
-char add_user_flag[] = "add_user_flag";
-char disable_user_flag[] = "disable_user_flag";
-char enable_user_flag[] = "enable_user_flag";
+#define USER "username"
+#define OLD_PSWD "old_passwd"
+#define NEW_PSWD "new_passwd"
+#define NEW2_PSWD "new2_passwd"
+#define CHG_PASSWD_FLAG "chg_passwd_flag"
+#define ADD_USER_FLAG "add_user_flag"
+#define DISABLE_USER_FLAG "disable_user_flag"
+#define ENABLE_USER_FLAG "enable_user_flag"
 
 /* we need these because we link to locking*.o */
  void become_root(BOOL save_dir) {}
  void unbecome_root(BOOL restore_dir) {}
-/* We need this because we link to password.o */
-BOOL change_oem_password(struct smb_passwd *smbpw, char *new_passwd, BOOL override) {return False;}
 
 /****************************************************************************
 ****************************************************************************/
@@ -87,8 +85,8 @@ char *p = newstring;
 
 static char *make_parm_name(char *label)
 {
-static char parmname[1024];
-char *p = parmname;
+	static char parmname[1024];
+	char *p = parmname;
 
 	while (*label) {
 		if (*label == ' ') *p++ = '_';
@@ -576,257 +574,24 @@ static void shares_page(void)
 	printf("</FORM>\n");
 }
 
-/****************************************************************************
-****************************************************************************/
-static void sig_pipe ( int signo)
+/*************************************************************
+change a password either locally or remotely
+*************************************************************/
+static BOOL change_password(const char *remote_machine, char *user_name, 
+			    char *old_passwd, char *new_passwd, 
+			    BOOL add_user, BOOL enable_user, BOOL disable_user)
 {
-	printf("<p> SIGPIPE caught\n");
-}
-
-/****************************************************************************
-  create 2 pipes and use them to feed the smbpasswd program 
-****************************************************************************/
-static BOOL talk_to_smbpasswd(char *old, char *new)
-{
-	int 	i, n, fd1[2], fd2[2];
-	pid_t	pid;
-	BOOL	rslt;
-	char	line[MAX_STRINGLEN + 2]; /* one for newline, one for null */
-
-	if (signal(SIGPIPE, sig_pipe) == SIG_ERR) {
-		printf("<p> signal error");
+	if (remote_machine != NULL) {
+		return remote_password_change(remote_machine, user_name, old_passwd, new_passwd);
 	}
 
-	if ((pipe(fd1) < 0) || (pipe(fd2) < 0)) {
-		printf("<p> pipe error");
+	if(!initialize_password_db()) {
+		printf("Can't setup password database vectors.\n");
+		return False;
 	}
-
-	if ((pid = fork()) < 0) {
-		printf("<p> fork error");
-	}
-
-	/*
-	 * Create this relationship with the pipes between the parent and 
-	 * the child as detailed below.
-	 *
-	 * parent -> fd1[1] -- fd1[0] -> child 
-	 * parent <- fd2[0] -- fd2[1] <- child 
-	 *
-	 * fd1[0] is turned into child's stdin
-	 * fd2[1] is turned into child's stdout
-	 * fd2[1] is also turned into child's stderr
-	 *
-	 */
-	else if (pid > 0) {			/* parent */
-
-		int	to_child    = fd1[1];
-		int	from_child  = fd2[0];
-		int	wstat;
-
-		close(fd1[0]); /* parent doesn't need input  side of pipe fd1 */
-		close(fd2[1]); /* parent doesn't need output side of pipe fd2 */
-
-		/*
-		 * smbpasswd doesn't require any input to disable or enable a user 
-		 */
-		if (!cgi_variable(disable_user_flag) && !cgi_variable(enable_user_flag)) {
-			/*
-			 * smbpasswd requires a regular old user to send their old password 
-			 */
-			if (am_root() == False) {
-				n = (strlen(old) <= (MAX_STRINGLEN)) ? strlen(old) : (MAX_STRINGLEN);
-				strncpy( line, old, n);
-				line[n] = '\n'; n++; /* add carriage return */
-				line[n] =    0;      /* add null terminator, for debug */
-				if (write( to_child, line, n) != n) {
-					printf("<p> error on write to child");
-				}
-			}
-
-			/*
-			 * smbpasswd requires that the new password be sent to it twice
-			 */
-			for( i=0; i<2; i++) {
-				n = (strlen(new) <= (MAX_STRINGLEN)) ? strlen(new) : (MAX_STRINGLEN);
-				strncpy( line, new, n);
-				line[n] = '\n'; n++; /* add carriage return */
-				line[n] =    0;      /* add null terminator, for debug */
-				if (write( to_child, line, n) != n) {
-					printf("<p> error on write to child");
-					break;
-				}
-			}
-		}
-
-		/*
-		 * Wait for smbpasswd to finish
-		 */
-		if (sys_waitpid(pid, &wstat, 0) < 0) {
-			printf("<p> problem waiting");
-		}
-
-		/* 
-		 * Read the answer from the add program
-		 */
-		memset( line, '\0', sizeof(line));
-		if ((n = read( from_child, line, MAX_STRINGLEN)) < 0) {
-			printf("<p> error on read from child");
-		}
-
-		/*
-		 * Write the response from smbpasswd to user, if all is well
-		 * line[] should be just a null terminated line. We could 
-		 * check for the null line and not print anything, but we 
-		 * really should be checking the exit code if we want to be 
-		 * sure.
-		 */
-		line[n] = 0;    /* null terminate */
-		printf("<p> %s\n",line);
-	
-		close(to_child); 
-		close(from_child); 
 	
-		if (line[0] == '\0') {
-			rslt = True;   /* All ok */
-		} else {
-			rslt = False;  /* Something didn't work */
-		}
-		
-	} else {				/* child  */
-
-		int	from_parent  = fd1[0];
-		int	to_parent    = fd2[1];
-
-		close(fd1[1]); /* child  doesn't need output side of pipe fd1 */
-		close(fd2[0]); /* child  doesn't need input  side of pipe fd2 */
-
-		/*
-		 * Turn the from_parent pipe into the childs stdin 
-		 */
-		if (from_parent != STDIN_FILENO) {
-			if (dup2( from_parent, STDIN_FILENO) != STDIN_FILENO) {
-				printf("<p> dup2 error of stdin");
-			}
-			close( from_parent);
-		}
-
-		/*
-		 * Turn the to_parent pipe into the childs stdout
-		 */
-		if (to_parent != STDOUT_FILENO) {
-			if (dup2( to_parent, STDOUT_FILENO) != STDOUT_FILENO) {
-				printf("<p> dup2 error of stdout");
-			}
-			close( to_parent);
-		}
-		/*
-		 * Make the childs stderr the to_parent pipe also
-		 */
-		if (dup2( STDOUT_FILENO, STDERR_FILENO) != STDERR_FILENO) {
-			printf("<p> dup2 error of stdout");
-		}
-
-		
-		/* Root can do more */
-		if (am_root() == True) {
-			if (cgi_variable(add_user_flag)) {
-				/* 
-				 * Add a user 
-				 */
-				if (execl(SMB_PASSWD_PROGRAM, "smbpasswd", "-s", "-a", cgi_variable(user), (char *) 0) < 0) {
-					printf("<p> execl error of smbpasswd");
-				}
-			} else if (cgi_variable(disable_user_flag)) {
-				/* 
-				 * Disable a user 
-				 */
-				if (execl(SMB_PASSWD_PROGRAM, "smbpasswd", "-s", "-d", cgi_variable(user), (char *) 0) < 0) {
-					printf("<p> execl error of smbpasswd");
-				}
-			} else if (cgi_variable(enable_user_flag)) {
-				/* 
-				 * Enable a user 
-				 */
-				if (execl(SMB_PASSWD_PROGRAM, "smbpasswd", "-s", "-e", cgi_variable(user), (char *) 0) < 0) {
-					printf("<p> execl error of smbpasswd");
-				}
-			} else {
-				/* 
-			 	 * Change a users password 
-				 */
-				if (execl(SMB_PASSWD_PROGRAM, "smbpasswd", "-s", cgi_variable(user), (char *) 0) < 0) {
-					printf("<p> execl error of smbpasswd");
-				}
-			}
-		} else {
-			/* 
-		 	 * Ordinary users can change any users passwd if they know the old passwd
-			 */
-			if (execl(SMB_PASSWD_PROGRAM, "smbpasswd", "-s", (char *) 0) < 0) {
-				printf("<p> execl error of smbpasswd");
-			}
-		}
-	}
-	return(rslt);  
-}
-
-/****************************************************************************
-  become the specified uid - permanently !
-****************************************************************************/
-
-BOOL become_user_permanently(uid_t uid, gid_t gid)
-{
-
-    if (geteuid() != 0) {
-        return(True);
-    }
-
-    /* now completely lose our privilages. This is a fairly paranoid
-    way of doing it, but it does work on all systems that I know of */
-
-#ifdef HAVE_SETRESUID
-	/*
-	 * Firstly ensure all our uids are set to root.
-	 */
-    setresgid(0,0,0);
-    setresuid(0,0,0);
-
-	/*
-	 * Now ensure we change all our gids.
-	 */
-    setresgid(gid,gid,gid);
-
-	/*
-	 * Now ensure all the uids are the user.
-	 */
-    setresuid(uid,uid,uid);
-#else
-	/*
-	 * Firstly ensure all our uids are set to root.
-	 */
-    setuid(0);
-    seteuid(0);
-
-	/*
-	 * Now ensure we change all our gids.
-	 */
-    setgid(gid);
-    setegid(gid);
-
-	/*
-	 * Now ensure all the uids are the user.
-	 */
-    setuid(uid);
-    seteuid(uid);
-#endif
-
-    if (getuid() != uid || geteuid() != uid ||
-        getgid() != gid || getegid() != gid) {
-        /* We failed to lose our privilages. */
-        return False;
-    }
-
-	return(True);
+	return local_password_change(user_name, False, add_user, enable_user, 
+				     disable_user, False, new_passwd);
 }
 
 /****************************************************************************
@@ -834,11 +599,10 @@ BOOL become_user_permanently(uid_t uid, gid_t gid)
 ****************************************************************************/
 static void chg_passwd(void)
 {
-	struct passwd *pass = NULL;
 	BOOL rslt;
 
 	/* Make sure users name has been specified */
-	if (strlen(cgi_variable(user)) == 0) {
+	if (strlen(cgi_variable(USER)) == 0) {
 		printf("<p> Must specify \"User Name\" \n");
 		return;
 	}
@@ -847,50 +611,40 @@ static void chg_passwd(void)
 	 * smbpasswd doesn't require anything but the users name to disable or enable the user,
 	 * so if that's what we're doing, skip the rest of the checks
 	 */
-	if (!cgi_variable(disable_user_flag) && !cgi_variable(enable_user_flag)) {
+	if (!cgi_variable(DISABLE_USER_FLAG) && !cgi_variable(ENABLE_USER_FLAG)) {
 
 		/* If current user is not root, make sure old password has been specified */
-		if ((am_root() == False) &&  (strlen( cgi_variable(old_pswd)) <= 0)) {
+		if ((am_root() == False) &&  (strlen( cgi_variable(OLD_PSWD)) <= 0)) {
 			printf("<p> Must specify \"Old Password\" \n");
 			return;
 		}
 
 		/* Make sure new passwords have been specified */
-		if ((strlen( cgi_variable(new_pswd )) <= 0) ||
-		    (strlen( cgi_variable(new2_pswd)) <= 0)) {
+		if ((strlen( cgi_variable(NEW_PSWD)) <= 0) ||
+		    (strlen( cgi_variable(NEW2_PSWD)) <= 0)) {
 			printf("<p> Must specify \"New, and Re-typed Passwords\" \n");
 			return;
 		}
 
 		/* Make sure new passwords was typed correctly twice */
-		if (strcmp(cgi_variable(new_pswd), cgi_variable(new2_pswd)) != 0) {
+		if (strcmp(cgi_variable(NEW_PSWD), cgi_variable(NEW2_PSWD)) != 0) {
 			printf("<p> Re-typed password didn't match new password\n");
 			return;
 		}
 	}
 
-#ifdef SWAT_DEBUG
-	if (pass) printf("<p> User uid %d  gid %d \n", pass->pw_uid, pass->pw_gid);
-	printf("<p> Processes uid %d, euid %d, gid %d, egid %d \n",getuid(),geteuid(),getgid(),getegid());
-	printf("<p> User Name %s     \n", cgi_variable(user));
-	printf("<p> Old passwd %s    \n", cgi_variable(old_pswd) ? cgi_variable(old_pswd):"");
-	printf("<p> New passwd %s    \n", cgi_variable(new_pswd));
-	printf("<p> Re-typed New passwd %s    \n", cgi_variable(new2_pswd));
-	printf("<p> flags '%s', '%s', '%s'   \n", 
-		(cgi_variable( chg_passwd_flag) ? cgi_variable( chg_passwd_flag) : ""),
-		(cgi_variable( add_user_flag) ? cgi_variable( add_user_flag) : ""),
-		(cgi_variable( disable_user_flag) ? cgi_variable( disable_user_flag) : ""));
-		(cgi_variable( enable_user_flag) ? cgi_variable( enable_user_flag) : ""));
-#endif /* SWAT_DEBUG */
-
-
-	rslt = talk_to_smbpasswd( cgi_variable(old_pswd), cgi_variable(new_pswd));
-	if (am_root() == False) {
-		if (rslt == True) {
-			printf("<p> The passwd for '%s' has been changed. \n",cgi_variable(user));
-		} else {
-			printf("<p> The passwd for '%s' has NOT been changed. \n",cgi_variable(user));
-		}
+	rslt = change_password(am_root() ? NULL : "127.0.0.1",
+			       cgi_variable(USER),
+			       cgi_variable(OLD_PSWD), cgi_variable(NEW_PSWD),
+			       cgi_variable(ADD_USER_FLAG)? True : False,
+			       cgi_variable(ENABLE_USER_FLAG)? True : False,
+			       cgi_variable(DISABLE_USER_FLAG)? True : False);
+
+
+	if (rslt == True) {
+		printf("<p> The passwd for '%s' has been changed. \n", cgi_variable(USER));
+	} else {
+		printf("<p> The passwd for '%s' has NOT been changed. \n",cgi_variable(USER));
 	}
 	
 	return;
@@ -913,29 +667,30 @@ static void passwd_page(void)
 	 * After the first time through here be nice. If the user
 	 * changed the User box text to another users name, remember it.
 	 */
-	if ( cgi_variable(user) && 
-	    (strcmp(cgi_variable(user), get_user_name()))) {
+	if (cgi_variable(USER) && 
+	    (strcmp(cgi_variable(USER), get_user_name()))) {
 		/* User is changing another accounts passwd */
-		new_name = cgi_variable(user);
+		new_name = cgi_variable(USER);
 	} else {
 		/* User is changing there own passwd */
 		new_name = get_user_name();
 	}
 
-	printf("<p> User Name        : <input type=text size=30 name=%s value=%s> \n", user, new_name);
+	printf("<p> User Name        : <input type=text size=30 name=%s value=%s> \n", 
+	       USER, new_name);
 	if (am_root() == False) {
-		printf("<p> Old Password: <input type=password size=30 name=%s>\n",old_pswd);
+		printf("<p> Old Password: <input type=password size=30 name=%s>\n",OLD_PSWD);
 	}
-	printf("<p> New Password: <input type=password size=30 name=%s>\n",new_pswd);
-	printf("<p> Re-type New Password: <input type=password size=30 name=%s>\n",new2_pswd);
+	printf("<p> New Password: <input type=password size=30 name=%s>\n",NEW_PSWD);
+	printf("<p> Re-type New Password: <input type=password size=30 name=%s>\n",NEW2_PSWD);
 
 	printf("</select></td></tr><p>");
 	printf("<tr><td>");
-	printf("<input type=submit name=%s value=\"Change Password\">", chg_passwd_flag);
+	printf("<input type=submit name=%s value=\"Change Password\">", CHG_PASSWD_FLAG);
 	if (am_root() == True) {
-		printf("<input type=submit name=%s value=\"Add New User\">", add_user_flag);
-		printf("<input type=submit name=%s value=\"Disable User\">", disable_user_flag);
-		printf("<input type=submit name=%s value=\"Enable User\">", enable_user_flag);
+		printf("<input type=submit name=%s value=\"Add New User\">", ADD_USER_FLAG);
+		printf("<input type=submit name=%s value=\"Disable User\">", DISABLE_USER_FLAG);
+		printf("<input type=submit name=%s value=\"Enable User\">", ENABLE_USER_FLAG);
 	}
 	printf("</td>\n");
 
@@ -943,7 +698,7 @@ static void passwd_page(void)
 	 * If we don't have user information then there's nothing to do. It's probably
 	 * the first time through this code.
 	 */
-	if (cgi_variable(user)) {
+	if (cgi_variable(USER)) {
 		chg_passwd();		
 	}
 
-- 
cgit 


From c287a820572c90b05175356bf2bb9d7f72c1a9d3 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 12 Nov 1998 07:13:06 +0000
Subject: fixed demo mode (This used to be commit
 530a98022e5207772980fc7d286547686713927a)

---
 source3/web/swat.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 67582bc116..0c1576edbc 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -29,6 +29,7 @@
 #define GLOBALS_SNUM -1
 
 static pstring servicesf = CONFIGFILE;
+static BOOL demo_mode = False;
 
 /*
  * Password Management Globals
@@ -581,12 +582,17 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 			    char *old_passwd, char *new_passwd, 
 			    BOOL add_user, BOOL enable_user, BOOL disable_user)
 {
+	if (demo_mode) {
+		printf("password change in demo mode rejected\n<p>");
+		return False;
+	}
+	
 	if (remote_machine != NULL) {
 		return remote_password_change(remote_machine, user_name, old_passwd, new_passwd);
 	}
 
 	if(!initialize_password_db()) {
-		printf("Can't setup password database vectors.\n");
+		printf("Can't setup password database vectors.\n<p>");
 		return False;
 	}
 	
@@ -802,7 +808,6 @@ static void printers_page(void)
 	extern FILE *dbf;
 	int opt;
 	char *page;
-	int auth_required = 1;
 
 	/* just in case it goes wild ... */
 	alarm(300);
@@ -817,12 +822,12 @@ static void printers_page(void)
 			pstrcpy(servicesf,optarg);
 			break;	  
 		case 'a':
-			auth_required = 0;
+			demo_mode = True;
 			break;	  
 		}
 	}
 
-	cgi_setup(SWATDIR, auth_required);
+	cgi_setup(SWATDIR, !demo_mode);
 
 	print_header();
 	
@@ -840,7 +845,7 @@ static void printers_page(void)
 	page = cgi_pathinfo();
 
 	/* Root gets full functionality */
-	if (am_root() == True) {
+	if (demo_mode || am_root()) {
 		if (strcmp(page, "globals")==0) {
 			globals_page();
 		} else if (strcmp(page,"shares")==0) {
-- 
cgit 


From 27d96564cebae49cb7e1a5e360e5e9f99d10fbb0 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 12 Nov 1998 07:28:29 +0000
Subject: show all buttons in demo mode (This used to be commit
 d076daaaf8690ae0b1ff9c8782619e518f868109)

---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 0c1576edbc..f5c8e286cd 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -405,7 +405,7 @@ static void show_main_buttons(void)
 	image_link("Home", "", "images/home.gif");
 
 	/* Root gets full functionality */
-	if (am_root() == True) {
+	if (demo_mode || am_root()) {
 		image_link("Globals", "globals", "images/globals.gif");
 		image_link("Shares", "shares", "images/shares.gif");
 		image_link("Printers", "printers", "images/printers.gif");
-- 
cgit 


From 6bf01d58ca4240a765be5042b9a3a3217b115fbf Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 12 Nov 1998 07:32:33 +0000
Subject: handle null usernames (This used to be commit
 ee60d9a289f8d94f8e4d8405f7b41690b891bbb1)

---
 source3/web/swat.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index f5c8e286cd..a1e56e9389 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -661,7 +661,7 @@ static void chg_passwd(void)
 ****************************************************************************/
 static void passwd_page(void)
 {
-	char *new_name;
+	char *new_name = get_user_name();
 
 	printf("<H2>Password Manager</H2>\n");
 
@@ -673,14 +673,11 @@ static void passwd_page(void)
 	 * After the first time through here be nice. If the user
 	 * changed the User box text to another users name, remember it.
 	 */
-	if (cgi_variable(USER) && 
-	    (strcmp(cgi_variable(USER), get_user_name()))) {
-		/* User is changing another accounts passwd */
+	if (cgi_variable(USER)) {
 		new_name = cgi_variable(USER);
-	} else {
-		/* User is changing there own passwd */
-		new_name = get_user_name();
-	}
+	} 
+
+	if (!new_name) new_name = "";
 
 	printf("<p> User Name        : <input type=text size=30 name=%s value=%s> \n", 
 	       USER, new_name);
-- 
cgit 


From 7e71258563a8d34eb1fa1a67e27d7339510bffc9 Mon Sep 17 00:00:00 2001
From: Herb Lewis <herb@samba.org>
Date: Thu, 12 Nov 1998 18:44:16 +0000
Subject: changes from John Sygulla for changing remote passwords (This used to
 be commit e3fc90d0b5b21d49615c951a475d85f15fa01271)

---
 source3/web/swat.c | 96 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 79 insertions(+), 17 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index a1e56e9389..c2e5ea560e 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -38,10 +38,12 @@ static BOOL demo_mode = False;
 #define OLD_PSWD "old_passwd"
 #define NEW_PSWD "new_passwd"
 #define NEW2_PSWD "new2_passwd"
-#define CHG_PASSWD_FLAG "chg_passwd_flag"
+#define CHG_S_PASSWD_FLAG "chg_s_passwd_flag"
+#define CHG_R_PASSWD_FLAG "chg_r_passwd_flag"
 #define ADD_USER_FLAG "add_user_flag"
 #define DISABLE_USER_FLAG "disable_user_flag"
 #define ENABLE_USER_FLAG "enable_user_flag"
+#define RHOST "remote_host"
 
 /* we need these because we link to locking*.o */
  void become_root(BOOL save_dir) {}
@@ -605,6 +607,7 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 ****************************************************************************/
 static void chg_passwd(void)
 {
+	char *host;
 	BOOL rslt;
 
 	/* Make sure users name has been specified */
@@ -619,12 +622,22 @@ static void chg_passwd(void)
 	 */
 	if (!cgi_variable(DISABLE_USER_FLAG) && !cgi_variable(ENABLE_USER_FLAG)) {
 
-		/* If current user is not root, make sure old password has been specified */
-		if ((am_root() == False) &&  (strlen( cgi_variable(OLD_PSWD)) <= 0)) {
+		/*
+		 * If current user is not root, make sure old password has been specified 
+		 * If REMOTE change, even root must provide old password 
+		 */
+		if (((am_root() == False) && (strlen( cgi_variable(OLD_PSWD)) <= 0)) ||
+		    ((cgi_variable(CHG_R_PASSWD_FLAG)) &&  (strlen( cgi_variable(OLD_PSWD)) <= 0))) {
 			printf("<p> Must specify \"Old Password\" \n");
 			return;
 		}
 
+		/* If changing a users password on a remote hosts we have to know what host */
+		if ((cgi_variable(CHG_R_PASSWD_FLAG)) && (strlen( cgi_variable(RHOST)) <= 0)) {
+			printf("<p> Must specify \"Remote Machine\" \n");
+			return;
+		}
+
 		/* Make sure new passwords have been specified */
 		if ((strlen( cgi_variable(NEW_PSWD)) <= 0) ||
 		    (strlen( cgi_variable(NEW2_PSWD)) <= 0)) {
@@ -639,7 +652,14 @@ static void chg_passwd(void)
 		}
 	}
 
-	rslt = change_password(am_root() ? NULL : "127.0.0.1",
+	if (cgi_variable(CHG_R_PASSWD_FLAG)) {
+		host = cgi_variable(RHOST);
+	} else if (am_root()) {
+		host = NULL;
+	} else {
+		host = "127.0.0.1";
+	}
+	rslt = change_password(host,
 			       cgi_variable(USER),
 			       cgi_variable(OLD_PSWD), cgi_variable(NEW_PSWD),
 			       cgi_variable(ADD_USER_FLAG)? True : False,
@@ -663,12 +683,6 @@ static void passwd_page(void)
 {
 	char *new_name = get_user_name();
 
-	printf("<H2>Password Manager</H2>\n");
-
-	printf("<FORM name=\"swatform\" method=post>\n");
-
-	printf("<table>\n");
-
 	/* 
 	 * After the first time through here be nice. If the user
 	 * changed the User box text to another users name, remember it.
@@ -679,6 +693,15 @@ static void passwd_page(void)
 
 	if (!new_name) new_name = "";
 
+	printf("<H2>Server Password Management</H2>\n");
+
+	printf("<FORM name=\"swatform\" method=post>\n");
+
+	printf("<table>\n");
+
+	/* 
+	 * Create all the dialog boxes for data collection
+	 */
 	printf("<p> User Name        : <input type=text size=30 name=%s value=%s> \n", 
 	       USER, new_name);
 	if (am_root() == False) {
@@ -687,21 +710,60 @@ static void passwd_page(void)
 	printf("<p> New Password: <input type=password size=30 name=%s>\n",NEW_PSWD);
 	printf("<p> Re-type New Password: <input type=password size=30 name=%s>\n",NEW2_PSWD);
 
-	printf("</select></td></tr><p>");
-	printf("<tr><td>");
-	printf("<input type=submit name=%s value=\"Change Password\">", CHG_PASSWD_FLAG);
+	/*
+	 * Create all the control buttons for requesting action
+	 */
+	printf("<p><tr><td>");
+	printf("<input type=submit name=%s value=\"Change Password\">", CHG_S_PASSWD_FLAG);
 	if (am_root() == True) {
 		printf("<input type=submit name=%s value=\"Add New User\">", ADD_USER_FLAG);
 		printf("<input type=submit name=%s value=\"Disable User\">", DISABLE_USER_FLAG);
 		printf("<input type=submit name=%s value=\"Enable User\">", ENABLE_USER_FLAG);
 	}
-	printf("</td>\n");
+	printf("</td></tr>\n");
 
 	/*
-	 * If we don't have user information then there's nothing to do. It's probably
-	 * the first time through this code.
+	 * Do some work if change, add, disable or enable was requested. It could be
+	 * this is the first time through this code, so there isn't anything to do.
 	 */
-	if (cgi_variable(USER)) {
+	if ((cgi_variable(CHG_S_PASSWD_FLAG)) || (cgi_variable(ADD_USER_FLAG)) ||
+	    (cgi_variable(DISABLE_USER_FLAG)) || (cgi_variable(ENABLE_USER_FLAG))) {
+		chg_passwd();		
+	}
+
+	printf("</table>");
+
+	printf("</FORM>\n");
+
+	printf("<H2>Client/Server Password Management</H2>\n");
+
+	printf("<FORM name=\"swatform\" method=post>\n");
+
+	printf("<table>\n");
+
+	/* 
+	 * Create all the dialog boxes for data collection
+	 */
+	printf("<p> User Name        : <input type=text size=30 name=%s value=%s> \n", 
+	       USER, new_name);
+	printf("<p> Old Password: <input type=password size=30 name=%s>\n",OLD_PSWD);
+	printf("<p> New Password: <input type=password size=30 name=%s>\n",NEW_PSWD);
+	printf("<p> Re-type New Password: <input type=password size=30 name=%s>\n",NEW2_PSWD);
+	printf("<p> Remote Machine: <input type=password size=30 name=%s>\n",RHOST);
+
+	/*
+	 * Create all the control buttons for requesting action
+	 */
+	printf("<p><tr><td>");
+	printf("<input type=submit name=%s value=\"Change Password\">", CHG_R_PASSWD_FLAG);
+	printf("</td></tr>\n");
+
+	/*
+	 * Do some work if a request has been made to change the password somewhere other
+	 * than the server. It could be this is the first time through this code, so there 
+	 * isn't anything to do.
+	 */
+	if (cgi_variable(CHG_R_PASSWD_FLAG)) {
 		chg_passwd();		
 	}
 
-- 
cgit 


From d30b6ab54847164aa3add34f3b50132af58f9453 Mon Sep 17 00:00:00 2001
From: Herb Lewis <herb@samba.org>
Date: Thu, 12 Nov 1998 22:17:51 +0000
Subject: .cvsignore: Removed old entries. client/client.c: include/client.h:
 Added some debug messages that the old client used to 		  generate.
 These are needed to make scripts such as 		  'findsmb' work -
 there may be other changes to keep 		  backwards output
 compatibility. Do we need a -old-client-compat 		  argument ?
 libsmb/clientgen.c: Fixed crash bug where malloc'ed data wasn't being 	
     cleared - corrupted malloc chains. web/swat.c: John's changes to get rid
 of "ghost" table entries. (This used to be commit
 3c45a3503ea57d17e98eb3e57514161a5c82e45e)

---
 source3/web/swat.c | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index c2e5ea560e..ecfc480395 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -702,25 +702,26 @@ static void passwd_page(void)
 	/* 
 	 * Create all the dialog boxes for data collection
 	 */
-	printf("<p> User Name        : <input type=text size=30 name=%s value=%s> \n", 
-	       USER, new_name);
+	printf("<tr><td> User Name : </td>\n");
+	printf("<td><input type=text size=30 name=%s value=%s></td></tr> \n", USER, new_name);
 	if (am_root() == False) {
-		printf("<p> Old Password: <input type=password size=30 name=%s>\n",OLD_PSWD);
+		printf("<tr><td> Old Password : </td>\n");
+		printf("<td><input type=password size=30 name=%s></td></tr> \n",OLD_PSWD);
 	}
-	printf("<p> New Password: <input type=password size=30 name=%s>\n",NEW_PSWD);
-	printf("<p> Re-type New Password: <input type=password size=30 name=%s>\n",NEW2_PSWD);
+	printf("<tr><td> New Password : </td>\n");
+	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
+	printf("<tr><td> Re-type New Password : </td>\n");
+	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
 
 	/*
 	 * Create all the control buttons for requesting action
 	 */
-	printf("<p><tr><td>");
-	printf("<input type=submit name=%s value=\"Change Password\">", CHG_S_PASSWD_FLAG);
+	printf("<tr><td><input type=submit name=%s value=\"Change Password\"></td></tr>\n", CHG_S_PASSWD_FLAG);
 	if (am_root() == True) {
-		printf("<input type=submit name=%s value=\"Add New User\">", ADD_USER_FLAG);
-		printf("<input type=submit name=%s value=\"Disable User\">", DISABLE_USER_FLAG);
-		printf("<input type=submit name=%s value=\"Enable User\">", ENABLE_USER_FLAG);
+		printf("<tr><td><input type=submit name=%s value=\"Add New User\"></td></tr>\n", ADD_USER_FLAG);
+		printf("<tr><td><input type=submit name=%s value=\"Disable User\"></td></tr>\n", DISABLE_USER_FLAG);
+		printf("<tr><td><input type=submit name=%s value=\"Enable User\"></td></tr>\n", ENABLE_USER_FLAG);
 	}
-	printf("</td></tr>\n");
 
 	/*
 	 * Do some work if change, add, disable or enable was requested. It could be
@@ -731,7 +732,7 @@ static void passwd_page(void)
 		chg_passwd();		
 	}
 
-	printf("</table>");
+	printf("</table>\n");
 
 	printf("</FORM>\n");
 
@@ -744,19 +745,21 @@ static void passwd_page(void)
 	/* 
 	 * Create all the dialog boxes for data collection
 	 */
-	printf("<p> User Name        : <input type=text size=30 name=%s value=%s> \n", 
-	       USER, new_name);
-	printf("<p> Old Password: <input type=password size=30 name=%s>\n",OLD_PSWD);
-	printf("<p> New Password: <input type=password size=30 name=%s>\n",NEW_PSWD);
-	printf("<p> Re-type New Password: <input type=password size=30 name=%s>\n",NEW2_PSWD);
-	printf("<p> Remote Machine: <input type=password size=30 name=%s>\n",RHOST);
+	printf("<tr><td> User Name : </td>\n");
+	printf("<td><input type=text size=30 name=%s value=%s></td></tr>\n",USER, new_name);
+	printf("<tr><td> Old Password : </td>\n");
+	printf("<td><input type=password size=30 name=%s></td></tr>\n",OLD_PSWD);
+	printf("<tr><td> New Password : </td>\n");
+	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
+	printf("<tr><td> Re-type New Password : </td>\n");
+	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
+	printf("<tr><td> Remote Machine : </td>\n");
+	printf("<td><input type=password size=30 name=%s></td></tr>\n",RHOST);
 
 	/*
 	 * Create all the control buttons for requesting action
 	 */
-	printf("<p><tr><td>");
-	printf("<input type=submit name=%s value=\"Change Password\">", CHG_R_PASSWD_FLAG);
-	printf("</td></tr>\n");
+	printf("<tr><td><input type=submit name=%s value=\"Change Password\"></td></tr>", CHG_R_PASSWD_FLAG);
 
 	/*
 	 * Do some work if a request has been made to change the password somewhere other
-- 
cgit 


From ea2fa33f6564389240c4b414e27065a4a01dcfbc Mon Sep 17 00:00:00 2001
From: Herb Lewis <herb@samba.org>
Date: Thu, 12 Nov 1998 23:49:32 +0000
Subject: Removed code that used printf/fprintf in password changin libraries.
 Now passes strings instead. (This used to be commit
 48af29bcc9e8094de6ba057a52dbae3c80ea7a05)

---
 source3/web/swat.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index ecfc480395..852d7c0933 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -584,13 +584,21 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 			    char *old_passwd, char *new_passwd, 
 			    BOOL add_user, BOOL enable_user, BOOL disable_user)
 {
+	BOOL ret = False;
+	pstring err_str;
+	pstring msg_str;
+
 	if (demo_mode) {
 		printf("password change in demo mode rejected\n<p>");
 		return False;
 	}
 	
 	if (remote_machine != NULL) {
-		return remote_password_change(remote_machine, user_name, old_passwd, new_passwd);
+		ret = remote_password_change(remote_machine, user_name, old_passwd, 
+									 new_passwd, err_str, sizeof(err_str));
+		if(*err_str)
+			printf("%s\n<p>", err_str);
+		return ret;
 	}
 
 	if(!initialize_password_db()) {
@@ -598,8 +606,16 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 		return False;
 	}
 	
-	return local_password_change(user_name, False, add_user, enable_user, 
-				     disable_user, False, new_passwd);
+	ret = local_password_change(user_name, False, add_user, enable_user, 
+				     disable_user, False, new_passwd, err_str, sizeof(err_str),
+					 msg_str, sizeof(msg_str));
+
+	if(*msg_str)
+		printf("%\n<p>", msg_str);
+	if(*err_str)
+		printf("%s\n<p>", err_str);
+
+	return ret;
 }
 
 /****************************************************************************
-- 
cgit 


From e5d9a4f4e3c8c278f36ae6e9900012b0840518d3 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 12 Nov 1998 23:59:59 +0000
Subject: %\ is an interesting printf argument, but I prefer %s (This used to
 be commit b93f686655e871d7bfec9c7601cf3c175008041a)

---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 852d7c0933..30150815fe 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -611,7 +611,7 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 					 msg_str, sizeof(msg_str));
 
 	if(*msg_str)
-		printf("%\n<p>", msg_str);
+		printf("%s\n<p>", msg_str);
 	if(*err_str)
 		printf("%s\n<p>", err_str);
 
-- 
cgit 


From 8fc1504ff8204dd1ca735f31c769f6dadf0f88cb Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 13 Nov 1998 21:41:01 +0000
Subject: Makefile.in configure configure.in include/config.h.in: Changes for
 DGUX and UNIXWARE. groupdb/aliasdb.c groupdb/aliasfile.c groupdb/groupfile.c:
 Don't use snprinf, use slprintf. include/includes.h: Fix YP problem.
 include/smb.h: Fix ZERO_STRUCTP. lib/util_sock.c: Added strerror() in debugs.
 passdb/ldap.c: Don't use snprinf, use slprintf. rpc_client/cli_lsarpc.c
 rpc_client/cli_pipe.c rpc_parse/parse_sec.c rpc_server/srv_pipe.c: Don't use
 snprinf, use slprintf. script/installman.sh: DGUX changes. smbd/open.c
 smbd/oplock.c: Fixed gcc warnings. web/swat.c: Changes USER to SWAT_USER.
 (This used to be commit 4c2b5a00983501e5d4aad1456ba8b5ab0dfd9b4c)

---
 source3/web/swat.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 30150815fe..ad98b7b96e 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -34,7 +34,7 @@ static BOOL demo_mode = False;
 /*
  * Password Management Globals
  */
-#define USER "username"
+#define SWAT_USER "username"
 #define OLD_PSWD "old_passwd"
 #define NEW_PSWD "new_passwd"
 #define NEW2_PSWD "new2_passwd"
@@ -627,7 +627,7 @@ static void chg_passwd(void)
 	BOOL rslt;
 
 	/* Make sure users name has been specified */
-	if (strlen(cgi_variable(USER)) == 0) {
+	if (strlen(cgi_variable(SWAT_USER)) == 0) {
 		printf("<p> Must specify \"User Name\" \n");
 		return;
 	}
@@ -676,7 +676,7 @@ static void chg_passwd(void)
 		host = "127.0.0.1";
 	}
 	rslt = change_password(host,
-			       cgi_variable(USER),
+			       cgi_variable(SWAT_USER),
 			       cgi_variable(OLD_PSWD), cgi_variable(NEW_PSWD),
 			       cgi_variable(ADD_USER_FLAG)? True : False,
 			       cgi_variable(ENABLE_USER_FLAG)? True : False,
@@ -684,9 +684,9 @@ static void chg_passwd(void)
 
 
 	if (rslt == True) {
-		printf("<p> The passwd for '%s' has been changed. \n", cgi_variable(USER));
+		printf("<p> The passwd for '%s' has been changed. \n", cgi_variable(SWAT_USER));
 	} else {
-		printf("<p> The passwd for '%s' has NOT been changed. \n",cgi_variable(USER));
+		printf("<p> The passwd for '%s' has NOT been changed. \n",cgi_variable(SWAT_USER));
 	}
 	
 	return;
@@ -703,8 +703,8 @@ static void passwd_page(void)
 	 * After the first time through here be nice. If the user
 	 * changed the User box text to another users name, remember it.
 	 */
-	if (cgi_variable(USER)) {
-		new_name = cgi_variable(USER);
+	if (cgi_variable(SWAT_USER)) {
+		new_name = cgi_variable(SWAT_USER);
 	} 
 
 	if (!new_name) new_name = "";
@@ -719,7 +719,7 @@ static void passwd_page(void)
 	 * Create all the dialog boxes for data collection
 	 */
 	printf("<tr><td> User Name : </td>\n");
-	printf("<td><input type=text size=30 name=%s value=%s></td></tr> \n", USER, new_name);
+	printf("<td><input type=text size=30 name=%s value=%s></td></tr> \n", SWAT_USER, new_name);
 	if (am_root() == False) {
 		printf("<tr><td> Old Password : </td>\n");
 		printf("<td><input type=password size=30 name=%s></td></tr> \n",OLD_PSWD);
@@ -762,7 +762,7 @@ static void passwd_page(void)
 	 * Create all the dialog boxes for data collection
 	 */
 	printf("<tr><td> User Name : </td>\n");
-	printf("<td><input type=text size=30 name=%s value=%s></td></tr>\n",USER, new_name);
+	printf("<td><input type=text size=30 name=%s value=%s></td></tr>\n",SWAT_USER, new_name);
 	printf("<tr><td> Old Password : </td>\n");
 	printf("<td><input type=password size=30 name=%s></td></tr>\n",OLD_PSWD);
 	printf("<tr><td> New Password : </td>\n");
-- 
cgit 


From 5be7ae453d588bf520a71723115e5edbd5584d07 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 14 Nov 1998 02:10:55 +0000
Subject: remove code that allows installation via cgi

swat will now give an error message if run via cgi
(This used to be commit 55377e3cdd5d8428e89b40946f0535b8cf5247ae)
---
 source3/web/cgi.c  | 55 ++++++++++++++++++++++++++++++++++--------------------
 source3/web/swat.c |  2 +-
 2 files changed, 36 insertions(+), 21 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 9b5cf2158c..db2cfb4555 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -45,6 +45,7 @@ static char *query_string;
 static char *baseurl;
 static char *pathinfo;
 static char *C_user;
+static BOOL inetd_server;
 
 static void unescape(char *buf)
 {
@@ -257,6 +258,27 @@ static void cgi_setup_error(char *err, char *header, char *info)
 }
 
 
+/***************************************************************************
+tell a browser about a fatal authentication error
+  ***************************************************************************/
+static void cgi_auth_error(void)
+{
+	if (inetd_server) {
+                cgi_setup_error("401 Authorization Required", 
+                                "WWW-Authenticate: Basic realm=\"SWAT\"\r\n",
+                                "You must be authenticated to use this service");
+	} else {
+		printf("Content-Type: text/html\r\n");
+
+		printf("\r\n<HTML><HEAD><TITLE>SWAT</TITLE></HEAD>\n");
+		printf("<BODY><H1>Installation Error</H1>\n");
+		printf("SWAT must be installed via inetd. It cannot be run as a CGI script<p>\n");
+		printf("</BODY></HTML>\r\n");
+	}
+	exit(0);
+}
+
+
 /***************************************************************************
 decode a base64 string in-place - simple and slow algorithm
   ***************************************************************************/
@@ -297,7 +319,7 @@ static BOOL cgi_handle_authorization(char *line)
 {
 	char *p, *user, *user_pass;
 	struct passwd *pass = NULL;
-	int ret = False;
+	BOOL ret = False;
 
 	if (strncasecmp(line,"Basic ", 6)) {
 		cgi_setup_error("401 Bad Authorization", "", 
@@ -387,7 +409,7 @@ BOOL am_root(void)
 /***************************************************************************
 return a ptr to the users name
   ***************************************************************************/
-char *get_user_name(void)
+char *cgi_user_name(void)
 {
         return(C_user);
 }
@@ -460,21 +482,16 @@ void cgi_setup(char *rootdir, int auth_required)
 				"chdir failed - the server is not configured correctly");
 	}
 
+	/* maybe we are running under a web server */
 	if (getenv("CONTENT_LENGTH") || getenv("REQUEST_METHOD")) {
-
-		char *x;
-
-		/* Save the users name if available */
-		if ((x = getenv("REMOTE_USER"))) {
-			C_user = strdup(x);
-		} else {
-			C_user = "";
+		if (auth_required) {
+			cgi_auth_error();
 		}
-
-		/* assume we are running under a real web server */
 		return;
 	}
 
+	inetd_server = True;
+
 #if CGI_LOGGING
 	f = fopen("/tmp/cgi.log", "a");
 	if (f) fprintf(f,"\n[Date: %s   %s (%s)]\n", 
@@ -509,9 +526,7 @@ void cgi_setup(char *rootdir, int auth_required)
 #endif
 
 	if (auth_required && !authenticated) {
-		cgi_setup_error("401 Authorization Required", 
-				"WWW-Authenticate: Basic realm=\"root\"\r\n",
-				"You must be authenticated to use this service");
+		cgi_auth_error();
 	}
 
 	if (!url) {
@@ -551,7 +566,7 @@ return the current pages URL
   ***************************************************************************/
 char *cgi_baseurl(void)
 {
-	if (baseurl) {
+	if (inetd_server) {
 		return baseurl;
 	}
 	return getenv("SCRIPT_NAME");
@@ -563,7 +578,7 @@ return the current pages path info
 char *cgi_pathinfo(void)
 {
 	char *r;
-	if (pathinfo) {
+	if (inetd_server) {
 		return pathinfo;
 	}
 	r = getenv("PATH_INFO");
@@ -577,7 +592,7 @@ return the hostname of the client
   ***************************************************************************/
 char *cgi_remote_host(void)
 {
-	if (baseurl) {
+	if (inetd_server) {
 		return client_name(1);
 	}
 	return getenv("REMOTE_HOST");
@@ -588,7 +603,7 @@ return the hostname of the client
   ***************************************************************************/
 char *cgi_remote_addr(void)
 {
-	if (baseurl) {
+	if (inetd_server) {
 		return client_addr(1);
 	}
 	return getenv("REMOTE_ADDR");
@@ -600,7 +615,7 @@ return True if the request was a POST
   ***************************************************************************/
 BOOL cgi_waspost(void)
 {
-	if (baseurl) {
+	if (inetd_server) {
 		return request_post;
 	}
 	return strequal(getenv("REQUEST_METHOD"), "POST");
diff --git a/source3/web/swat.c b/source3/web/swat.c
index ad98b7b96e..4d12e4b2f4 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -697,7 +697,7 @@ static void chg_passwd(void)
 ****************************************************************************/
 static void passwd_page(void)
 {
-	char *new_name = get_user_name();
+	char *new_name = cgi_user_name();
 
 	/* 
 	 * After the first time through here be nice. If the user
-- 
cgit 


From f61683195340baa58e2637811350dbc2c5e6af01 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 14 Nov 1998 02:14:30 +0000
Subject: allow all user to view the config (This used to be commit
 ab35d99e52225b0e9f519903ae99e575075187e7)

---
 source3/web/swat.c | 58 +++++++++++++++++++++---------------------------------
 1 file changed, 22 insertions(+), 36 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 4d12e4b2f4..db21fbfbe1 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -406,16 +406,11 @@ static void show_main_buttons(void)
 {
 	image_link("Home", "", "images/home.gif");
 
-	/* Root gets full functionality */
-	if (demo_mode || am_root()) {
-		image_link("Globals", "globals", "images/globals.gif");
-		image_link("Shares", "shares", "images/shares.gif");
-		image_link("Printers", "printers", "images/printers.gif");
-		image_link("Status", "status", "images/status.gif");
-		image_link("View Config", "viewconfig","images/viewconfig.gif");
-	}
-
-	/* Everyone gets this functionality */
+	image_link("Globals", "globals", "images/globals.gif");
+	image_link("Shares", "shares", "images/shares.gif");
+	image_link("Printers", "printers", "images/printers.gif");
+	image_link("Status", "status", "images/status.gif");
+	image_link("View Config", "viewconfig","images/viewconfig.gif");
 	image_link("Password Management", "passwd", "images/passwd.gif");
 
 	printf("<HR>\n");
@@ -642,7 +637,7 @@ static void chg_passwd(void)
 		 * If current user is not root, make sure old password has been specified 
 		 * If REMOTE change, even root must provide old password 
 		 */
-		if (((am_root() == False) && (strlen( cgi_variable(OLD_PSWD)) <= 0)) ||
+		if (((!am_root()) && (strlen( cgi_variable(OLD_PSWD)) <= 0)) ||
 		    ((cgi_variable(CHG_R_PASSWD_FLAG)) &&  (strlen( cgi_variable(OLD_PSWD)) <= 0))) {
 			printf("<p> Must specify \"Old Password\" \n");
 			return;
@@ -720,7 +715,7 @@ static void passwd_page(void)
 	 */
 	printf("<tr><td> User Name : </td>\n");
 	printf("<td><input type=text size=30 name=%s value=%s></td></tr> \n", SWAT_USER, new_name);
-	if (am_root() == False) {
+	if (!am_root()) {
 		printf("<tr><td> Old Password : </td>\n");
 		printf("<td><input type=password size=30 name=%s></td></tr> \n",OLD_PSWD);
 	}
@@ -733,7 +728,7 @@ static void passwd_page(void)
 	 * Create all the control buttons for requesting action
 	 */
 	printf("<tr><td><input type=submit name=%s value=\"Change Password\"></td></tr>\n", CHG_S_PASSWD_FLAG);
-	if (am_root() == True) {
+	if (demo_mode || am_root()) {
 		printf("<tr><td><input type=submit name=%s value=\"Add New User\"></td></tr>\n", ADD_USER_FLAG);
 		printf("<tr><td><input type=submit name=%s value=\"Disable User\"></td></tr>\n", DISABLE_USER_FLAG);
 		printf("<tr><td><input type=submit name=%s value=\"Enable User\"></td></tr>\n", ENABLE_USER_FLAG);
@@ -923,31 +918,22 @@ static void printers_page(void)
 	page = cgi_pathinfo();
 
 	/* Root gets full functionality */
-	if (demo_mode || am_root()) {
-		if (strcmp(page, "globals")==0) {
-			globals_page();
-		} else if (strcmp(page,"shares")==0) {
-			shares_page();
-		} else if (strcmp(page,"printers")==0) {
-			printers_page();
-		} else if (strcmp(page,"status")==0) {
-			status_page();
-		} else if (strcmp(page,"viewconfig")==0) {
-			viewconfig_page();
-		} else if (strcmp(page,"passwd")==0) {
-			passwd_page();
-		} else {
-			welcome_page();
-		}
+	if (strcmp(page, "globals")==0) {
+		globals_page();
+	} else if (strcmp(page,"shares")==0) {
+		shares_page();
+	} else if (strcmp(page,"printers")==0) {
+		printers_page();
+	} else if (strcmp(page,"status")==0) {
+		status_page();
+	} else if (strcmp(page,"viewconfig")==0) {
+		viewconfig_page();
+	} else if (strcmp(page,"passwd")==0) {
+		passwd_page();
 	} else {
-		/* Everyone gets this functionality */
-		if (strcmp(page,"passwd")==0) {
-			passwd_page();
-		} else {
-			welcome_page();
-		}
+		welcome_page();
 	}
-	
+
 	print_footer();
 	return 0;
 }
-- 
cgit 


From 57d4977f24566675111d791949491908eb4a6c4e Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 14 Nov 1998 02:29:38 +0000
Subject: - new prototypes - much as I hate doing it I've removed the "commit
 changes" button for   users that don't have write access to smb.conf (Jeremy
 insisted) (This used to be commit 8e8ab4df1fe77dfcae73a34f4de174afe09cd695)

---
 source3/web/swat.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index db21fbfbe1..8f47ced52d 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -30,6 +30,7 @@
 
 static pstring servicesf = CONFIGFILE;
 static BOOL demo_mode = False;
+static BOOL have_write_access = False;
 
 /*
  * Password Management Globals
@@ -469,7 +470,10 @@ static void globals_page(void)
 
 	printf("<FORM name=\"swatform\" method=post>\n");
 
-	printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+	if (have_write_access) {
+		printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+	}
+
 	printf("<input type=reset name=\"Reset Values\" value=\"Reset Values\">\n");
 	if (advanced == 0) {
 		printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
@@ -549,7 +553,10 @@ static void shares_page(void)
 
 
 	if (snum >= 0) {
-		printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+		if (have_write_access) {
+			printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+		}
+
 		printf("<input type=submit name=\"Delete\" value=\"Delete Share\">\n");
 		if (advanced == 0) {
 			printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
@@ -848,7 +855,9 @@ static void printers_page(void)
 
 
 	if (snum >= 0) {
-		printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+		if (have_write_access) {
+			printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+		}
 		printf("<input type=submit name=\"Delete\" value=\"Delete Printer\">\n");
 		if (advanced == 0) {
 			printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
@@ -917,6 +926,10 @@ static void printers_page(void)
 
 	page = cgi_pathinfo();
 
+	/* check if the authenticated user has write access - if not then
+	   don't show write options */
+	have_write_access = (access(servicesf,W_OK) == 0);
+
 	/* Root gets full functionality */
 	if (strcmp(page, "globals")==0) {
 		globals_page();
-- 
cgit 


From 74d539f5573a3ed3ff1b96c54752a389da4c3e14 Mon Sep 17 00:00:00 2001
From: Luke Leighton <lkcl@samba.org>
Date: Tue, 17 Nov 1998 16:19:04 +0000
Subject: - group database API.  oops and oh dear, the threat has been carried
 out:   the pre-alpha "domain group" etc parameters have disappeared.

- interactive debug detection

- re-added mem_man (andrew's memory management, detects memory corruption)

- american spellings of "initialise" replaced with english spelling of
  "initialise".

- started on "lookup_name()" and "lookup_sid()" functions.  proper ones.

- moved lots of functions around.  created some modules of commonly used
  code.  e.g the password file locking code, which is used in groupfile.c
  and aliasfile.c and smbpass.c

- moved RID_TYPE_MASK up another bit.  this is really unfortunate, but
  there is no other "fast" way to identify users from groups from aliases.
  i do not believe that this code saves us anything (the multipliers)
  and puts us at a disadvantage (reduces the useable rid space).
  the designers of NT aren't silly: if they can get away with a user-
  interface-speed LsaLookupNames / LsaLookupSids, then so can we.  i
  spoke with isaac at the cifs conference, the only time for example that
  they do a security context check is on file create.  certainly not on
  individual file reads / writes, which would drastically hit their
  performance and ours, too.

- renamed myworkgroup to global_sam_name, amongst other things, when used
  in the rpc code.  there is also a global_member_name, as we are always
  responsible for a SAM database, the scope of which is limited by the role
  of the machine (e.g if a member of a workgroup, your SAM is for _local_
  logins only, and its name is the name of your server.  you even still
  have a SID.  see LsaQueryInfoPolicy, levels 3 and 5).

- updated functionality of groupname.c to be able to cope with names
  like DOMAIN\group and SERVER\alias.  used this code to be able to
  do aliases as well as groups.  this code may actually be better
  off being used in username mapping, too.

- created a connect to serverlist function in clientgen.c and used it
  in password.c

- initialisation in server.c depends on the role of the server.  well,
  it does now.

- rpctorture.  smbtorture.  EXERCISE EXTREME CAUTION.
(This used to be commit 0d21e1e6090b933f396c764af535ca3388a562db)
---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 8f47ced52d..cdbd1f8c8c 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -603,7 +603,7 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 		return ret;
 	}
 
-	if(!initialize_password_db()) {
+	if(!initialise_password_db()) {
 		printf("Can't setup password database vectors.\n<p>");
 		return False;
 	}
-- 
cgit 


From 768761820e8d7481c586c4e0ab4ac7cb36d18c4b Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 17 Nov 1998 20:50:07 +0000
Subject: Added the same open()/fopen()/creat()/mmap() -> sys_XXX calls.

Tidied up some of the mess (no other word for it). Still doesn't
compile cleanly. There are calls with incorrect parameters that
don't seem to be doing the right thing.

This code still needs surgery :-(.

Jeremy.
(This used to be commit 18ff93a9abbf68ee8c59c0af3e57c63e4a015dac)
---
 source3/web/cgi.c        | 4 ++--
 source3/web/statuspage.c | 4 ++--
 source3/web/swat.c       | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index db2cfb4555..009244e595 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -437,7 +437,7 @@ static void cgi_download(char *file)
 		cgi_setup_error("404 File Not Found","",
 				"The requested file was not found");
 	}
-	fd = open(file,O_RDONLY);
+	fd = sys_open(file,O_RDONLY,0);
 	if (fd == -1) {
 		cgi_setup_error("404 File Not Found","",
 				"The requested file was not found");
@@ -493,7 +493,7 @@ void cgi_setup(char *rootdir, int auth_required)
 	inetd_server = True;
 
 #if CGI_LOGGING
-	f = fopen("/tmp/cgi.log", "a");
+	f = sys_fopen("/tmp/cgi.log", "a");
 	if (f) fprintf(f,"\n[Date: %s   %s (%s)]\n", 
 		       http_timestring(time(NULL)),
 		       client_name(1), client_addr(1));
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 184f7e1f73..81564390a0 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -124,7 +124,7 @@ void status_page(void)
 	pstrcat(fname,"/STATUS..LCK");
 
 
-	f = fopen(fname,"r");
+	f = sys_fopen(fname,"r");
 	if (f) {
 		while (!feof(f)) {
 			if (fread(&crec,sizeof(crec),1,f) != 1)	break;
@@ -157,7 +157,7 @@ void status_page(void)
 
 	printf("<p>\n");
 
-	f = fopen(fname,"r");
+	f = sys_fopen(fname,"r");
 	if (!f) {
 		printf("Couldn't open status file %s\n",fname);
 		if (!lp_status(-1))
diff --git a/source3/web/swat.c b/source3/web/swat.c
index cdbd1f8c8c..7004891f32 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -106,7 +106,7 @@ static char *make_parm_name(char *label)
 ****************************************************************************/
 static int include_html(char *fname)
 {
-	FILE *f = fopen(fname,"r");
+	FILE *f = sys_fopen(fname,"r");
 	char buf[1024];
 	int ret;
 
@@ -318,7 +318,7 @@ static int save_reload(void)
 {
 	FILE *f;
 
-	f = fopen(servicesf,"w");
+	f = sys_fopen(servicesf,"w");
 	if (!f) {
 		printf("failed to open %s for writing\n", servicesf);
 		return 0;
@@ -894,7 +894,7 @@ static void printers_page(void)
 	/* just in case it goes wild ... */
 	alarm(300);
 
-	dbf = fopen("/dev/null", "w");
+	dbf = sys_fopen("/dev/null", "w");
 
 	if (!dbf) dbf = stderr;
 
-- 
cgit 


From a44db4a3284e8eb6065bfedb7f3bf3188e282095 Mon Sep 17 00:00:00 2001
From: Herb Lewis <herb@samba.org>
Date: Fri, 20 Nov 1998 00:15:26 +0000
Subject: wrong directory path for smbd and nmbd (This used to be commit
 a33b4f623f196ca7e8056454b9212fe0ffa389c2)

---
 source3/web/startstop.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 9eeac96cc0..6a15e7a46f 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -37,7 +37,7 @@ void start_smbd(void)
 		return;
 	}
 
-	slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", SBINDIR);
+	slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", BINDIR);
 
 	become_daemon();
 
@@ -58,7 +58,7 @@ void start_nmbd(void)
 		return;
 	}
 
-	slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", SBINDIR);
+	slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", BINDIR);
 	
 	become_daemon();
 
-- 
cgit 


From a97baa50fdbf951cf3568b7068a7194f22642d52 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 21 Nov 1998 00:16:28 +0000
Subject: smbd/password.c: Added *SMBSERVER fix is name is too long.
 web/swat.c: Changed '?' to help. Jeremy. (This used to be commit
 631913ea856926a77304692c74a1bd27faead179)

---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 7004891f32..8c5ac782a3 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -163,7 +163,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		ptr = lp_local_ptr(snum, ptr);
 	}
 
-	printf("<tr><td><A HREF=\"/swat/help/smb.conf.5.html#%s\">?</A> %s</td><td>", 
+	printf("<tr><td><A HREF=\"/swat/help/smb.conf.5.html#%s\">Help</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s</td><td>", 
 	       stripspace(parm->label), parm->label);
 
 	switch (parm->type) {
-- 
cgit 


From 42e96160d373885007c4f9cc6e6b5b69e04a998b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 21 Nov 1998 01:41:14 +0000
Subject: make SWAT obey the global "hosts allow" and "hosts deny" settings.
 any attempt to run swat from a host that is disallowed will give an error.
 (This used to be commit fe4ef4bbef01aed75807c884249ca8efa5de4140)

---
 source3/web/cgi.c  | 25 ++++++++++++++++++++++++-
 source3/web/swat.c | 17 +++++------------
 2 files changed, 29 insertions(+), 13 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 009244e595..275bf8999f 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -46,6 +46,7 @@ static char *baseurl;
 static char *pathinfo;
 static char *C_user;
 static BOOL inetd_server;
+static BOOL got_request;
 
 static void unescape(char *buf)
 {
@@ -253,7 +254,21 @@ tell a browser about a fatal error in the http processing
   ***************************************************************************/
 static void cgi_setup_error(char *err, char *header, char *info)
 {
-	printf("HTTP/1.0 %s\r\n%sConnection: close\r\nContent-Type: text/html\r\n\r\n<HTML><HEAD><TITLE>%s</TITLE></HEAD><BODY><H1>%s</H1>%s<p></BODY></HTML>\r\n", err, header, err, err, info);
+	if (!got_request) {
+		/* 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) {
+				break;
+			}
+		}
+	}
+
+	printf("HTTP/1.0 %s\r\n%sConnection: close\r\nContent-Type: text/html\r\n\r\n<HTML><HEAD><TITLE>%s</TITLE></HEAD><BODY><H1>%s</H1>%s<p></BODY></HTML>\r\n\r\n", err, header, err, err, info);
+	fclose(stdin);
+	fclose(stdout);
 	exit(0);
 }
 
@@ -492,6 +507,11 @@ void cgi_setup(char *rootdir, int auth_required)
 
 	inetd_server = True;
 
+	if (!check_access(1, lp_hostsallow(-1), lp_hostsdeny(-1))) {
+		cgi_setup_error("400 Server Error", "",
+				"Samba is configured to deny access from this client\n<br>Check your \"hosts allow\" and \"hosts deny\" options in smb.conf ");
+	}
+
 #if CGI_LOGGING
 	f = sys_fopen("/tmp/cgi.log", "a");
 	if (f) fprintf(f,"\n[Date: %s   %s (%s)]\n", 
@@ -507,11 +527,14 @@ void cgi_setup(char *rootdir, int auth_required)
 #endif
 		if (line[0] == '\r' || line[0] == '\n') break;
 		if (strncasecmp(line,"GET ", 4)==0) {
+			got_request = True;
 			url = strdup(&line[4]);
 		} else if (strncasecmp(line,"POST ", 5)==0) {
+			got_request = True;
 			request_post = 1;
 			url = strdup(&line[5]);
 		} else if (strncasecmp(line,"PUT ", 4)==0) {
+			got_request = True;
 			cgi_setup_error("400 Bad Request", "",
 					"This server does not accept PUT requests");
 		} else if (strncasecmp(line,"Authorization: ", 15)==0) {
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 8c5ac782a3..ed139e2483 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -382,12 +382,9 @@ static void commit_parameters(int snum)
 /****************************************************************************
   load the smb.conf file into loadparm.
 ****************************************************************************/
-static void load_config(void)
+static BOOL load_config(void)
 {
-	if (!lp_load(servicesf,False,True,False)) {
-		printf("<b>Can't load %s - using defaults</b><p>\n", 
-		       servicesf);
-	}
+	return lp_load(servicesf,False,True,False);
 }
 
 /****************************************************************************
@@ -909,17 +906,13 @@ static void printers_page(void)
 		}
 	}
 
+	charset_initialise();
+	load_config();
+
 	cgi_setup(SWATDIR, !demo_mode);
 
 	print_header();
 	
-	charset_initialise();
-
-	/* if this binary is setuid then run completely as root */
-	setuid(0);
-
-	load_config();
-
 	cgi_load_variables(NULL);
 
 	show_main_buttons();
-- 
cgit 


From 8757254f39ab75c93e9917a6bdf99475c6a024d7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 23 Nov 1998 03:36:10 +0000
Subject: changed string_sub() to replace " ; and ` in the inserted string with
 _

use all_string_sub() if you don't want this.
(This used to be commit a3357ab49335106674fe7a7481cd0f146d74fbe5)
---
 source3/web/statuspage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 81564390a0..faf1dcb20d 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -26,7 +26,7 @@ static char *tstring(time_t t)
 {
 	static pstring buf;
 	pstrcpy(buf, asctime(LocalTime(&t)));
-	string_sub(buf," ","&nbsp;");
+	all_string_sub(buf," ","&nbsp;");
 	return buf;
 }
 
-- 
cgit 


From 89058f8bc1735b2c9d806ac8f5cf8e76ff07c7eb Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 27 Nov 1998 06:09:25 +0000
Subject: better layout of password options. (This used to be commit
 d3fa0dd7a80a8d20e2d9db0b5ca24988059280fb)

---
 source3/web/swat.c | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index ed139e2483..8538082a13 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -727,30 +727,32 @@ static void passwd_page(void)
 	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
 	printf("<tr><td> Re-type New Password : </td>\n");
 	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
+	printf("</table>\n");
 
 	/*
 	 * Create all the control buttons for requesting action
 	 */
-	printf("<tr><td><input type=submit name=%s value=\"Change Password\"></td></tr>\n", CHG_S_PASSWD_FLAG);
+	printf("<input type=submit name=%s value=\"Change Password\">\n", 
+	       CHG_S_PASSWD_FLAG);
 	if (demo_mode || am_root()) {
-		printf("<tr><td><input type=submit name=%s value=\"Add New User\"></td></tr>\n", ADD_USER_FLAG);
-		printf("<tr><td><input type=submit name=%s value=\"Disable User\"></td></tr>\n", DISABLE_USER_FLAG);
-		printf("<tr><td><input type=submit name=%s value=\"Enable User\"></td></tr>\n", ENABLE_USER_FLAG);
+		printf("<input type=submit name=%s value=\"Add New User\">\n",
+		       ADD_USER_FLAG);
+		printf("<input type=submit name=%s value=\"Disable User\">\n", 
+		       DISABLE_USER_FLAG);
+		printf("<input type=submit name=%s value=\"Enable User\">\n", 
+		       ENABLE_USER_FLAG);
 	}
+	printf("<p></FORM>\n");
 
 	/*
-	 * Do some work if change, add, disable or enable was requested. It could be
-	 * this is the first time through this code, so there isn't anything to do.
-	 */
+	 * Do some work if change, add, disable or enable was
+	 * requested. It could be this is the first time through this
+	 * code, so there isn't anything to do.  */
 	if ((cgi_variable(CHG_S_PASSWD_FLAG)) || (cgi_variable(ADD_USER_FLAG)) ||
 	    (cgi_variable(DISABLE_USER_FLAG)) || (cgi_variable(ENABLE_USER_FLAG))) {
 		chg_passwd();		
 	}
 
-	printf("</table>\n");
-
-	printf("</FORM>\n");
-
 	printf("<H2>Client/Server Password Management</H2>\n");
 
 	printf("<FORM name=\"swatform\" method=post>\n");
@@ -771,23 +773,25 @@ static void passwd_page(void)
 	printf("<tr><td> Remote Machine : </td>\n");
 	printf("<td><input type=password size=30 name=%s></td></tr>\n",RHOST);
 
+	printf("</table>");
+
 	/*
 	 * Create all the control buttons for requesting action
 	 */
-	printf("<tr><td><input type=submit name=%s value=\"Change Password\"></td></tr>", CHG_R_PASSWD_FLAG);
+	printf("<input type=submit name=%s value=\"Change Password\">", 
+	       CHG_R_PASSWD_FLAG);
+
+	printf("<p></FORM>\n");
 
 	/*
-	 * Do some work if a request has been made to change the password somewhere other
-	 * than the server. It could be this is the first time through this code, so there 
-	 * isn't anything to do.
-	 */
+	 * Do some work if a request has been made to change the
+	 * password somewhere other than the server. It could be this
+	 * is the first time through this code, so there isn't
+	 * anything to do.  */
 	if (cgi_variable(CHG_R_PASSWD_FLAG)) {
 		chg_passwd();		
 	}
 
-	printf("</table>");
-
-	printf("</FORM>\n");
 }
 
 /****************************************************************************
-- 
cgit 


From b90966d85bd353e4b276b5998590435e88c4dbf6 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 27 Nov 1998 06:36:56 +0000
Subject: make the help links appear in a separate window, so you can read the
 docs and do configuration at the same time. (This used to be commit
 386a3bfd337f4b248f6c88b9c98b9d6471cc9b25)

---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 8538082a13..e29e728629 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -163,7 +163,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		ptr = lp_local_ptr(snum, ptr);
 	}
 
-	printf("<tr><td><A HREF=\"/swat/help/smb.conf.5.html#%s\">Help</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s</td><td>", 
+	printf("<tr><td><A HREF=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\">Help</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s</td><td>", 
 	       stripspace(parm->label), parm->label);
 
 	switch (parm->type) {
-- 
cgit 


From 30038de4623bc827ee8019c569faf00583d1fe58 Mon Sep 17 00:00:00 2001
From: Luke Leighton <lkcl@samba.org>
Date: Sun, 29 Nov 1998 20:03:33 +0000
Subject: weekend work.  user / group database API.

- split sam_passwd and smb_passwd into separate higher-order function tables

- renamed struct smb_passwd's "smb_user" to "unix_user".  added "nt_user"
plus user_rid, and added a "wrap" function in both sam_passwd and smb_passwd
password databases to fill in the blank entries that are not obtained
from whatever password database API instance is being used.

NOTE: whenever a struct smb_passwd or struct sam_passwd is used, it MUST
be initialised with pwdb_sam_init() or pwd_smb_init(), see chgpasswd.c
for the only example outside of the password database APIs i could find.

- added query_useraliases code to rpcclient.

- dealt with some nasty interdependencies involving non-smbd programs
and the password database API.  this is still not satisfactorily
resolved completelely, but it's the best i can do for now.

- #ifdef'd out some password database options so that people don't
mistakenly set them unless they recompile to _use_ those options.

lots of debugging done, it's still not finished.  the unix/NT uid/gid
and user-rid/group-rid issues are better, but not perfect.  the "BUILTIN"
domain is still missing: users cannot be added to "BUILTIN" groups yet,
as we only have an "alias" db API and a "group" db API but not "builtin-alias"
db API...
(This used to be commit 5d5d7e4de7d1514ab87b07ede629de8aa00519a1)
---
 source3/web/swat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index e29e728629..c4baa70e0b 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -600,7 +600,8 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 		return ret;
 	}
 
-	if(!initialise_password_db()) {
+	if (!pwdb_initialise())
+	{
 		printf("Can't setup password database vectors.\n<p>");
 		return False;
 	}
-- 
cgit 


From 04e382fb166a64de193dc3c7b21187d8382eaeea Mon Sep 17 00:00:00 2001
From: Luke Leighton <lkcl@samba.org>
Date: Tue, 1 Dec 1998 19:10:44 +0000
Subject: rpc_samr.h parse_samr.c srv_samr.c :

	samr_query_aliasmembers (cool!)

util_pwdb.c sids.c nmbd.c server.c smbpasswd.c swat.c :

	pwdb_initialise(BOOL is_server) now creates / reads DOMAIN_NAME.SID
	if is_server is True, and does LsaQueryInfoPolicy(levels 3 and 5)
	to obtain member and pdc sids.
(This used to be commit 3e1eb4f26b67e484b05e1dde94fd4e4dae982631)
---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index c4baa70e0b..3383b29f3b 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -600,7 +600,7 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 		return ret;
 	}
 
-	if (!pwdb_initialise())
+	if (!pwdb_initialise(False))
 	{
 		printf("Can't setup password database vectors.\n<p>");
 		return False;
-- 
cgit 


From a3c6e96a22bfaaa5a2993e85327555266476013d Mon Sep 17 00:00:00 2001
From: Luke Leighton <lkcl@samba.org>
Date: Tue, 9 Mar 1999 01:21:57 +0000
Subject: mods to allow inter-domain trust accounts to be added to SAM database
 using smbpasswd command. (This used to be commit
 62d499f83256c6e8b3308dc4bd8e9f5df873b14b)

---
 source3/web/swat.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 3383b29f3b..ce7801ba5c 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -584,6 +584,8 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 			    BOOL add_user, BOOL enable_user, BOOL disable_user)
 {
 	BOOL ret = False;
+	uint16 acb_info = 0;
+	uint16 acb_mask = 0;
 	pstring err_str;
 	pstring msg_str;
 
@@ -606,9 +608,22 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 		return False;
 	}
 	
-	ret = local_password_change(user_name, False, add_user, enable_user, 
-				     disable_user, False, new_passwd, err_str, sizeof(err_str),
-					 msg_str, sizeof(msg_str));
+	if (enable_user)
+	{
+		acb_mask |= ACB_DISABLED;
+		acb_info &= ~ACB_DISABLED;
+	}
+
+	if (disable_user)
+	{
+		acb_mask |= ACB_DISABLED;
+		acb_info |= ACB_DISABLED;
+	}
+
+	ret = local_password_change(user_name, add_user,
+	                            acb_info, acb_mask,
+				    new_passwd, err_str, sizeof(err_str),
+	                            msg_str, sizeof(msg_str));
 
 	if(*msg_str)
 		printf("%s\n<p>", msg_str);
-- 
cgit 


From 731c7f2ecfe17651506ba05b88358360e4654a37 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 13 Jun 1999 04:14:24 +0000
Subject: Moved code that changes the pw_passwd entry (i.e shadow password and
 weird unixware stuff) into _Get_Pwnam() to fix a memory allocation bug.

Note that the Get_Pwnam() function now returns a const struct passwd *
as a hint to other developers not to change entries in the struct
passwd.
(This used to be commit 36d7cb4ccc42268e8e6a7b783c945d1853624958)
---
 source3/web/cgi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 275bf8999f..305c173a5d 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -333,7 +333,7 @@ handle a http authentication line
 static BOOL cgi_handle_authorization(char *line)
 {
 	char *p, *user, *user_pass;
-	struct passwd *pass = NULL;
+	const struct passwd *pass = NULL;
 	BOOL ret = False;
 
 	if (strncasecmp(line,"Basic ", 6)) {
-- 
cgit 


From 3db52feb1f3b2c07ce0b06ad4a7099fa6efe3fc7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 13 Dec 1999 13:27:58 +0000
Subject: first pass at updating head branch to be to be the same as the
 SAMBA_2_0 branch (This used to be commit
 453a822a76780063dff23526c35408866d0c0154)

---
 source3/web/cgi.c        |  21 +----
 source3/web/diagnose.c   |   2 +-
 source3/web/startstop.c  |   4 +-
 source3/web/statuspage.c |  72 +++++++++-------
 source3/web/swat.c       | 209 +++++++++++++++++++++++++++++++----------------
 5 files changed, 188 insertions(+), 120 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 305c173a5d..62a5e71e05 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -333,7 +333,7 @@ handle a http authentication line
 static BOOL cgi_handle_authorization(char *line)
 {
 	char *p, *user, *user_pass;
-	const struct passwd *pass = NULL;
+	struct passwd *pass = NULL;
 	BOOL ret = False;
 
 	if (strncasecmp(line,"Basic ", 6)) {
@@ -386,20 +386,7 @@ static BOOL cgi_handle_authorization(char *line)
 			 * We have not authenticated as root,
 			 * become the user *permanently*.
 			 */
-			if(!become_user_permanently(pass->pw_uid, pass->pw_gid)) {
-				/*
-				 * Always give the same error so a cracker
-				 * cannot tell why we fail.
-				 */
-				cgi_setup_error("401 Bad Authorization", "",
-	                "username/password must be supplied");
-		        return False;
-			}
-
-			/*
-			 * On exit from here we are the authenticated
-			 * user - no way back.
-			 */
+			become_user_permanently(pass->pw_uid, pass->pw_gid);
 		}
 
 		/* Save the users name */
@@ -571,9 +558,9 @@ void cgi_setup(char *rootdir, int auth_required)
 		*p = 0;
 	}
 
-	string_sub(url, "/swat/", "");
+	string_sub(url, "/swat/", "", 0);
 
-	if (strstr(url,"..")==0 && file_exist(url, NULL)) {
+	if (url[0] != '/' && strstr(url,"..")==0 && file_exist(url, NULL)) {
 		cgi_download(url);
 	}
 
diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index 054de2a631..f29e380b93 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -32,7 +32,7 @@ BOOL nmbd_running(void)
 	struct in_addr *ip_list;
 
 	if ((fd = open_socket_in(SOCK_DGRAM, 0, 3,
-				 interpret_addr("127.0.0.1"))) != -1) {
+				 interpret_addr("127.0.0.1"), True)) != -1) {
 		if ((ip_list = name_query(fd, "__SAMBA__", 0, 
 					  True, True, loopback_ip,
 					  &count,0)) != NULL) {
diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 6a15e7a46f..9eeac96cc0 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -37,7 +37,7 @@ void start_smbd(void)
 		return;
 	}
 
-	slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", BINDIR);
+	slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", SBINDIR);
 
 	become_daemon();
 
@@ -58,7 +58,7 @@ void start_nmbd(void)
 		return;
 	}
 
-	slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", BINDIR);
+	slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", SBINDIR);
 	
 	become_daemon();
 
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index faf1dcb20d..304a122e23 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -26,13 +26,13 @@ static char *tstring(time_t t)
 {
 	static pstring buf;
 	pstrcpy(buf, asctime(LocalTime(&t)));
-	all_string_sub(buf," ","&nbsp;");
+	all_string_sub(buf," ","&nbsp;",sizeof(buf));
 	return buf;
 }
 
 static void print_share_mode(share_mode_entry *e, char *fname)
 {
-	printf("<tr><td>%d</td>",e->pid);
+	printf("<tr><td>%d</td>",(int)e->pid);
 	printf("<td>");
 	switch ((e->share_mode>>4)&0xF) {
 	case DENY_NONE: printf("DENY_NONE"); break;
@@ -60,12 +60,14 @@ static void print_share_mode(share_mode_entry *e, char *fname)
 		printf("EXCLUSIVE       ");
 	else if (e->op_type & BATCH_OPLOCK)
 		printf("BATCH           ");
+	else if (e->op_type & LEVEL_II_OPLOCK)
+		printf("LEVEL_II        ");
 	else
 		printf("NONE            ");
 	printf("</td>");
 
 	printf("<td>%s</td><td>%s</td></tr>\n",
-	       fname,tstring(e->time.tv_sec));
+	       dos_to_unix(fname,False),tstring(e->time.tv_sec));
 }
 
 
@@ -131,7 +133,7 @@ void status_page(void)
 			if (crec.magic == 0x280267 && crec.cnum == -1 &&
 			    process_exists(crec.pid)) {
 				char buf[30];
-				slprintf(buf,sizeof(buf)-1,"kill_%d", crec.pid);
+				slprintf(buf,sizeof(buf)-1,"kill_%d", (int)crec.pid);
 				if (cgi_variable(buf)) {
 					kill_pid(crec.pid);
 				}
@@ -159,10 +161,10 @@ void status_page(void)
 
 	f = sys_fopen(fname,"r");
 	if (!f) {
-		printf("Couldn't open status file %s\n",fname);
+		/* open failure either means no connections have been
+                   made or status=no */
 		if (!lp_status(-1))
 			printf("You need to have status=yes in your smb config file\n");
-		return;
 	}
 
 
@@ -171,60 +173,74 @@ void status_page(void)
 	printf("<tr><td>version:</td><td>%s</td></tr>",VERSION);
 
 	fflush(stdout);
-	if (smbd_running()) {
-		printf("<tr><td>smbd:</td><td>running</td><td><input type=submit name=\"smbd_stop\" value=\"Stop smbd\"></td><td><input type=submit name=\"smbd_restart\" value=\"Restart smbd\"></td></tr>\n");
-	} else {
-		printf("<tr><td>smbd:</td><td>not running</td><td><input type=submit name=\"smbd_start\" value=\"Start smbd\"></td>><td><input type=submit name=\"smbd_restart\" value=\"Restart smbd\"></td></tr>\n");
+	printf("<tr><td>smbd:</td><td>%srunning</td>\n",smbd_running()?"":"not ");
+	if (geteuid() == 0) {
+	    if (smbd_running()) {
+		printf("<td><input type=submit name=\"smbd_stop\" value=\"Stop smbd\"></td>\n");
+	    } else {
+		printf("<td><input type=submit name=\"smbd_start\" value=\"Start smbd\"></td>\n");
+	    }
+	    printf("<td><input type=submit name=\"smbd_restart\" value=\"Restart smbd\"></td>\n");
 	}
+	printf("</tr>\n");
 
 	fflush(stdout);
-	if (nmbd_running()) {
-		printf("<tr><td>nmbd:</td><td>running</td><td><input type=submit name=\"nmbd_stop\" value=\"Stop nmbd\"></td><td><input type=submit name=\"nmbd_restart\" value=\"Restart nmbd\"></td></tr>\n");
-	} else {
-		printf("<tr><td>nmbd:</td><td>not running</td><td><input type=submit name=\"nmbd_start\" value=\"Start nmbd\"></td><td><input type=submit name=\"nmbd_restart\" value=\"Restart nmbd\"></td></tr>\n");
+	printf("<tr><td>nmbd:</td><td>%srunning</td>\n",nmbd_running()?"":"not ");
+	if (geteuid() == 0) {
+	    if (nmbd_running()) {
+		printf("<td><input type=submit name=\"nmbd_stop\" value=\"Stop nmbd\"></td>\n");
+	    } else {
+		printf("<td><input type=submit name=\"nmbd_start\" value=\"Start nmbd\"></td>\n");
+	    }
+	    printf("<td><input type=submit name=\"nmbd_restart\" value=\"Restart nmbd\"></td>\n");
 	}
+	printf("</tr>\n");
 
 	printf("</table>\n");
 	fflush(stdout);
 
-
-	if (geteuid() != 0)
-		printf("<b>NOTE: You are not logged in as root and won't be able to start/stop the server</b><p>\n");
-
 	printf("<p><h3>Active Connections</h3>\n");
 	printf("<table border=1>\n");
-	printf("<tr><th>PID</th><th>Client</th><th>IP address</th><th>Date</th><th>Kill</th></tr>\n");
+	printf("<tr><th>PID</th><th>Client</th><th>IP address</th><th>Date</th>\n");
+	if (geteuid() == 0) {
+		printf("<th>Kill</th>\n");
+	}
+	printf("</tr>\n");
 
-	while (!feof(f)) {
+	while (f && !feof(f)) {
 		if (fread(&crec,sizeof(crec),1,f) != 1)
 			break;
 		if (crec.magic == 0x280267 && 
 		    crec.cnum == -1 &&
 		    process_exists(crec.pid)) {
-			printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td><input type=submit value=\"X\" name=\"kill_%d\"></td></tr>\n",
-			       crec.pid,
+			printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td>\n",
+			       (int)crec.pid,
 			       crec.machine,crec.addr,
-			       tstring(crec.start),
-			       crec.pid);
+			       tstring(crec.start));
+			if (geteuid() == 0) {
+			    printf("<td><input type=submit value=\"X\" name=\"kill_%d\"></td>\n",
+			       (int)crec.pid);
+			}
+			printf("</tr>\n");
 		}
 	}
 
 	printf("</table><p>\n");
 
-	fseek(f, 0, SEEK_SET);
+	if (f) fseek(f, 0, SEEK_SET);
 	
 	printf("<p><h3>Active Shares</h3>\n");
 	printf("<table border=1>\n");
 	printf("<tr><th>Share</th><th>User</th><th>Group</th><th>PID</th><th>Client</th><th>Date</th></tr>\n\n");
 
-	while (!feof(f)) {
+	while (f && !feof(f)) {
 		if (fread(&crec,sizeof(crec),1,f) != 1)
 			break;
 		if (crec.cnum == -1) continue;
 		if (crec.magic == 0x280267 && process_exists(crec.pid)) {
 			printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td></tr>\n",
 			       crec.name,uidtoname(crec.uid),
-			       gidtoname(crec.gid),crec.pid,
+			       gidtoname(crec.gid),(int)crec.pid,
 			       crec.machine,
 			       tstring(crec.start));
 		}
@@ -241,7 +257,7 @@ void status_page(void)
 	locking_end();
 	printf("</table>\n");
 
-	fclose(f);
+	if (f) fclose(f);
 
 	printf("</FORM>\n");
 
diff --git a/source3/web/swat.c b/source3/web/swat.c
index ce7801ba5c..48c3ae07e2 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -31,6 +31,8 @@
 static pstring servicesf = CONFIGFILE;
 static BOOL demo_mode = False;
 static BOOL have_write_access = False;
+static BOOL have_read_access = False;
+static int iNumNonAutoPrintServices = 0;
 
 /*
  * Password Management Globals
@@ -215,9 +217,10 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		break;
 
 	case P_OCTAL:
-		printf("<input type=text size=8 name=\"parm_%s\" value=0%o>", make_parm_name(parm->label), *(int *)ptr);
-		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'0%o\'\">",
-			make_parm_name(parm->label),(int)(parm->def.ivalue));
+		printf("<input type=text size=8 name=\"parm_%s\" value=%s>", make_parm_name(parm->label), octal_string(*(int *)ptr));
+		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+		       make_parm_name(parm->label),
+		       octal_string((int)(parm->def.ivalue)));
 		break;
 
 	case P_ENUM:
@@ -252,10 +255,18 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 			continue;
 		}
 		if (parm->flags & FLAG_HIDE) continue;
+		if (snum >= 0) {
+			if (printers & !(parm->flags & FLAG_PRINT)) continue;
+			if (!printers & !(parm->flags & FLAG_SHARE)) continue;
+		}
 		if (!advanced) {
-			if (!printers && !(parm->flags & FLAG_BASIC)) {
+			if (!(parm->flags & FLAG_BASIC)) {
 				void *ptr = parm->ptr;
 
+				if (parm->class == P_LOCAL && snum >= 0) {
+					ptr = lp_local_ptr(snum, ptr);
+				}
+
 				switch (parm->type) {
 				case P_CHAR:
 					if (*(char *)ptr == (char)(parm->def.cvalue)) continue;
@@ -299,6 +310,15 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 	}
 }
 
+/****************************************************************************
+  load the smb.conf file into loadparm.
+****************************************************************************/
+static BOOL load_config(BOOL save_def)
+{
+	lp_resetnumservices();
+	return lp_load(servicesf,False,save_def,False);
+}
+
 /****************************************************************************
   write a config file 
 ****************************************************************************/
@@ -306,15 +326,15 @@ static void write_config(FILE *f, BOOL show_defaults)
 {
 	fprintf(f, "# Samba config file created using SWAT\n");
 	fprintf(f, "# from %s (%s)\n", cgi_remote_host(), cgi_remote_addr());
-	fprintf(f, "# Date: %s\n\n", timestring());
+	fprintf(f, "# Date: %s\n\n", timestring(False));
 	
-	lp_dump(f, show_defaults);	
+	lp_dump(f, show_defaults, iNumNonAutoPrintServices);	
 }
 
 /****************************************************************************
   save and reoad the smb.conf config file 
 ****************************************************************************/
-static int save_reload(void)
+static int save_reload(int snum)
 {
 	FILE *f;
 
@@ -325,14 +345,18 @@ static int save_reload(void)
 	}
 
 	write_config(f, False);
+	if (snum)
+		lp_dump_one(f, False, snum);
 	fclose(f);
 
 	lp_killunused(NULL);
 
-	if (!lp_load(servicesf,False,False,False)) {
+	if (!load_config(False)) {
                 printf("Can't reload %s\n", servicesf);
                 return 0;
         }
+	iNumNonAutoPrintServices = lp_numservices();
+	load_printers();
 
 	return 1;
 }
@@ -379,14 +403,6 @@ static void commit_parameters(int snum)
 	}
 }
 
-/****************************************************************************
-  load the smb.conf file into loadparm.
-****************************************************************************/
-static BOOL load_config(void)
-{
-	return lp_load(servicesf,False,True,False);
-}
-
 /****************************************************************************
   spit out the html for a link with an image 
 ****************************************************************************/
@@ -402,13 +418,22 @@ static void image_link(char *name,char *hlink, char *src)
 ****************************************************************************/
 static void show_main_buttons(void)
 {
-	image_link("Home", "", "images/home.gif");
+	char *p;
+	
+	if ((p = cgi_user_name()) && strcmp(p, "root")) {
+		printf("Logged in as <b>%s</b><p>\n", p);
+	}
 
-	image_link("Globals", "globals", "images/globals.gif");
-	image_link("Shares", "shares", "images/shares.gif");
-	image_link("Printers", "printers", "images/printers.gif");
-	image_link("Status", "status", "images/status.gif");
-	image_link("View Config", "viewconfig","images/viewconfig.gif");
+	image_link("Home", "", "images/home.gif");
+	if (have_write_access) {
+		image_link("Globals", "globals", "images/globals.gif");
+		image_link("Shares", "shares", "images/shares.gif");
+		image_link("Printers", "printers", "images/printers.gif");
+	}
+	if (have_read_access) {
+		image_link("Status", "status", "images/status.gif");
+		image_link("View Config", "viewconfig","images/viewconfig.gif");
+	}
 	image_link("Password Management", "passwd", "images/passwd.gif");
 
 	printf("<HR>\n");
@@ -462,7 +487,7 @@ static void globals_page(void)
 
 	if (cgi_variable("Commit")) {
 		commit_parameters(GLOBALS_SNUM);
-		save_reload();
+		save_reload(0);
 	}
 
 	printf("<FORM name=\"swatform\" method=post>\n");
@@ -511,26 +536,29 @@ static void shares_page(void)
 
 	if (cgi_variable("Commit") && snum >= 0) {
 		commit_parameters(snum);
-		save_reload();
+		save_reload(0);
 	}
 
 	if (cgi_variable("Delete") && snum >= 0) {
 		lp_remove_service(snum);
-		save_reload();
+		save_reload(0);
 		share = NULL;
 		snum = -1;
 	}
 
 	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
+		load_config(False);
 		lp_copy_service(GLOBALS_SNUM, share);
-		save_reload();
+		iNumNonAutoPrintServices = lp_numservices();
+		save_reload(0);
 		snum = lp_servicenumber(share);
 	}
 
 	printf("<FORM name=\"swatform\" method=post>\n");
 
 	printf("<table>\n");
-	printf("<tr><td><input type=submit name=selectshare value=\"Choose Share\"></td>\n");
+	printf("<tr>\n");
+	printf("<td><input type=submit name=selectshare value=\"Choose Share\"></td>\n");
 	printf("<td><select name=share>\n");
 	if (snum < 0)
 		printf("<option value=\" \"> \n");
@@ -542,10 +570,18 @@ static void shares_page(void)
 			       s, s);
 		}
 	}
-	printf("</select></td></tr><p>");
-
-	printf("<tr><td><input type=submit name=createshare value=\"Create Share\"></td>\n");
-	printf("<td><input type=text size=30 name=newshare></td></tr>\n");
+	printf("</select></td>\n");
+	if (have_write_access) {
+		printf("<td><input type=submit name=\"Delete\" value=\"Delete Share\"></td>\n");
+	}
+	printf("</tr>\n");
+	printf("</table>");
+	printf("<table>");
+	if (have_write_access) {
+		printf("<tr>\n");
+		printf("<td><input type=submit name=createshare value=\"Create Share\"></td>\n");
+		printf("<td><input type=text size=30 name=newshare></td></tr>\n");
+	}
 	printf("</table>");
 
 
@@ -554,7 +590,7 @@ static void shares_page(void)
 			printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
 		}
 
-		printf("<input type=submit name=\"Delete\" value=\"Delete Share\">\n");
+		printf("<input type=reset name=\"Reset Values\" value=\"Reset Values\">\n");
 		if (advanced == 0) {
 			printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
 		} else {
@@ -584,8 +620,6 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 			    BOOL add_user, BOOL enable_user, BOOL disable_user)
 {
 	BOOL ret = False;
-	uint16 acb_info = 0;
-	uint16 acb_mask = 0;
 	pstring err_str;
 	pstring msg_str;
 
@@ -602,28 +636,14 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 		return ret;
 	}
 
-	if (!pwdb_initialise(False))
-	{
+	if(!initialize_password_db()) {
 		printf("Can't setup password database vectors.\n<p>");
 		return False;
 	}
 	
-	if (enable_user)
-	{
-		acb_mask |= ACB_DISABLED;
-		acb_info &= ~ACB_DISABLED;
-	}
-
-	if (disable_user)
-	{
-		acb_mask |= ACB_DISABLED;
-		acb_info |= ACB_DISABLED;
-	}
-
-	ret = local_password_change(user_name, add_user,
-	                            acb_info, acb_mask,
-				    new_passwd, err_str, sizeof(err_str),
-	                            msg_str, sizeof(msg_str));
+	ret = local_password_change(user_name, False, add_user, enable_user, 
+				     disable_user, False, new_passwd, err_str, sizeof(err_str),
+					 msg_str, sizeof(msg_str));
 
 	if(*msg_str)
 		printf("%s\n<p>", msg_str);
@@ -787,7 +807,7 @@ static void passwd_page(void)
 	printf("<tr><td> Re-type New Password : </td>\n");
 	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
 	printf("<tr><td> Remote Machine : </td>\n");
-	printf("<td><input type=password size=30 name=%s></td></tr>\n",RHOST);
+	printf("<td><input type=text size=30 name=%s></td></tr>\n",RHOST);
 
 	printf("</table>");
 
@@ -826,26 +846,37 @@ static void printers_page(void)
 
 	printf("<H2>Printer Parameters</H2>\n");
 
+	printf("<H3>Important Note:</H3>\n");
+	printf("Printer names marked with [*] in the Choose Printer drop-down box ");
+	printf("are autoloaded printers from ");
+	printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">Printcap Name</A>.\n");
+	printf("Attempting to delete these printers from SWAT will have no effect.\n");
+
 	if (cgi_variable("Advanced") && !cgi_variable("Basic"))
 		advanced = 1;
 
 	if (cgi_variable("Commit") && snum >= 0) {
 		commit_parameters(snum);
-		save_reload();
+		if (snum >= iNumNonAutoPrintServices)
+		    save_reload(snum);
+		else
+		    save_reload(0);
 	}
 
 	if (cgi_variable("Delete") && snum >= 0) {
 		lp_remove_service(snum);
-		save_reload();
+		save_reload(0);
 		share = NULL;
 		snum = -1;
 	}
 
 	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
+		load_config(False);
 		lp_copy_service(GLOBALS_SNUM, share);
+		iNumNonAutoPrintServices = lp_numservices();
 		snum = lp_servicenumber(share);
 		lp_do_parameter(snum, "print ok", "Yes");
-		save_reload();
+		save_reload(0);
 		snum = lp_servicenumber(share);
 	}
 
@@ -859,23 +890,36 @@ static void printers_page(void)
 	for (i=0;i<lp_numservices();i++) {
 		s = lp_servicename(i);
 		if (s && (*s) && strcmp(s,"IPC$") && lp_print_ok(i)) {
+                    if (i >= iNumNonAutoPrintServices)
+                        printf("<option %s value=\"%s\">[*]%s\n",
+                               (share && strcmp(share,s)==0)?"SELECTED":"",
+                               s, s);
+                    else
 			printf("<option %s value=\"%s\">%s\n", 
 			       (share && strcmp(share,s)==0)?"SELECTED":"",
 			       s, s);
 		}
 	}
-	printf("</select></td></tr><p>");
+	printf("</select></td>");
+	if (have_write_access) {
+		printf("<td><input type=submit name=\"Delete\" value=\"Delete Printer\"></td>\n");
+	}
+	printf("</tr>");
+	printf("</table>\n");
 
-	printf("<tr><td><input type=submit name=createshare value=\"Create Printer\"></td>\n");
-	printf("<td><input type=text size=30 name=newshare></td></tr>\n");
-	printf("</table>");
+	if (have_write_access) {
+		printf("<table>\n");
+		printf("<tr><td><input type=submit name=createshare value=\"Create Printer\"></td>\n");
+		printf("<td><input type=text size=30 name=newshare></td></tr>\n");
+		printf("</table>");
+	}
 
 
 	if (snum >= 0) {
 		if (have_write_access) {
 			printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
 		}
-		printf("<input type=submit name=\"Delete\" value=\"Delete Printer\">\n");
+		printf("<input type=reset name=\"Reset Values\" value=\"Reset Values\">\n");
 		if (advanced == 0) {
 			printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
 		} else {
@@ -908,13 +952,22 @@ static void printers_page(void)
 	int opt;
 	char *page;
 
+	fault_setup(NULL);
+
+#if defined(HAVE_SET_AUTH_PARAMETERS)
+	set_auth_parameters(argc, argv);
+#endif /* HAVE_SET_AUTH_PARAMETERS */
+
 	/* just in case it goes wild ... */
 	alarm(300);
 
 	dbf = sys_fopen("/dev/null", "w");
-
 	if (!dbf) dbf = stderr;
 
+	/* we don't want stderr screwing us up */
+	close(2);
+	open("/dev/null", O_WRONLY);
+
 	while ((opt = getopt(argc, argv,"s:a")) != EOF) {
 		switch (opt) {
 		case 's':
@@ -927,7 +980,9 @@ static void printers_page(void)
 	}
 
 	charset_initialise();
-	load_config();
+	load_config(True);
+	iNumNonAutoPrintServices = lp_numservices();
+	load_printers();
 
 	cgi_setup(SWATDIR, !demo_mode);
 
@@ -935,24 +990,34 @@ static void printers_page(void)
 	
 	cgi_load_variables(NULL);
 
+	if (!file_exist(servicesf, NULL)) {
+		have_read_access = True;
+		have_write_access = True;
+	} else {
+		/* check if the authenticated user has write access - if not then
+		   don't show write options */
+		have_write_access = (access(servicesf,W_OK) == 0);
+
+		/* if the user doesn't have read access to smb.conf then
+		   don't let them view it */
+		have_read_access = (access(servicesf,R_OK) == 0);
+	}
+
+
 	show_main_buttons();
 
 	page = cgi_pathinfo();
 
-	/* check if the authenticated user has write access - if not then
-	   don't show write options */
-	have_write_access = (access(servicesf,W_OK) == 0);
-
 	/* Root gets full functionality */
-	if (strcmp(page, "globals")==0) {
+	if (have_read_access && strcmp(page, "globals")==0) {
 		globals_page();
-	} else if (strcmp(page,"shares")==0) {
+	} else if (have_read_access && strcmp(page,"shares")==0) {
 		shares_page();
-	} else if (strcmp(page,"printers")==0) {
+	} else if (have_read_access && strcmp(page,"printers")==0) {
 		printers_page();
-	} else if (strcmp(page,"status")==0) {
+	} else if (have_read_access && strcmp(page,"status")==0) {
 		status_page();
-	} else if (strcmp(page,"viewconfig")==0) {
+	} else if (have_read_access && strcmp(page,"viewconfig")==0) {
 		viewconfig_page();
 	} else if (strcmp(page,"passwd")==0) {
 		passwd_page();
-- 
cgit 


From 69d24d869bf97978b31a51fe8e8d08cac4874d67 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 21 Dec 1999 04:54:30 +0000
Subject: first cut at using the tdb code for the connections structure, the
 SWAT status page and smbstatus. It made the code _much_ simpler, I wish we'd
 done a database module a long time ago! (This used to be commit
 4951755413c11d4c5b9af4699a6e622056d52433)

---
 source3/web/statuspage.c | 117 +++++++++++++++++++++++++----------------------
 1 file changed, 63 insertions(+), 54 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 304a122e23..8b7108c0b5 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -71,15 +71,68 @@ static void print_share_mode(share_mode_entry *e, char *fname)
 }
 
 
+/* kill off any connections chosen by the user */
+static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf)
+{
+	struct connections_data crec;
+	memcpy(&crec, dbuf.dptr, sizeof(crec));
+
+	if (crec.cnum == -1 && process_exists(crec.pid)) {
+		char buf[30];
+		slprintf(buf,sizeof(buf)-1,"kill_%d", (int)crec.pid);
+		if (cgi_variable(buf)) {
+			kill_pid(crec.pid);
+		}
+	}
+	return 0;
+}
+
+/* traversal fn for showing machine connections */
+static int traverse_fn2(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf)
+{
+	struct connections_data crec;
+	memcpy(&crec, dbuf.dptr, sizeof(crec));
+	
+	if (crec.cnum != -1 || !process_exists(crec.pid)) return 0;
+
+	printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td>\n",
+	       (int)crec.pid,
+	       crec.machine,crec.addr,
+	       tstring(crec.start));
+	if (geteuid() == 0) {
+		printf("<td><input type=submit value=\"X\" name=\"kill_%d\"></td>\n",
+		       (int)crec.pid);
+	}
+	printf("</tr>\n");
+
+	return 0;
+}
+
+/* traversal fn for showing share connections */
+static int traverse_fn3(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf)
+{
+	struct connections_data crec;
+	memcpy(&crec, dbuf.dptr, sizeof(crec));
+
+	if (crec.cnum != -1 || !process_exists(crec.pid)) return 0;
+
+	printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td></tr>\n",
+	       crec.name,uidtoname(crec.uid),
+	       gidtoname(crec.gid),(int)crec.pid,
+	       crec.machine,
+	       tstring(crec.start));
+	return 0;
+}
+
+
 /* show the current server status */
 void status_page(void)
 {
-	struct connect_record crec;
 	pstring fname;
-	FILE *f;
 	char *v;
 	int autorefresh=0;
 	int refresh_interval=30;
+	TDB_CONTEXT *tdb;
 
 	if (cgi_variable("smbd_restart")) {
 		if (smbd_running())
@@ -123,24 +176,10 @@ void status_page(void)
 	pstrcpy(fname,lp_lockdir());
 	standard_sub_basic(fname);
 	trim_string(fname,"","/");
-	pstrcat(fname,"/STATUS..LCK");
-
-
-	f = sys_fopen(fname,"r");
-	if (f) {
-		while (!feof(f)) {
-			if (fread(&crec,sizeof(crec),1,f) != 1)	break;
-			if (crec.magic == 0x280267 && crec.cnum == -1 &&
-			    process_exists(crec.pid)) {
-				char buf[30];
-				slprintf(buf,sizeof(buf)-1,"kill_%d", (int)crec.pid);
-				if (cgi_variable(buf)) {
-					kill_pid(crec.pid);
-				}
-			}
-		}
-		fclose(f);
-	}
+	pstrcat(fname,"/connections.tdb");
+
+	tdb = tdb_open(fname, 0, O_RDONLY, 0);
+	if (tdb) tdb_traverse(tdb, traverse_fn1);
 
 	printf("<H2>Server Status</H2>\n");
 
@@ -159,8 +198,7 @@ void status_page(void)
 
 	printf("<p>\n");
 
-	f = sys_fopen(fname,"r");
-	if (!f) {
+	if (!tdb) {
 		/* open failure either means no connections have been
                    made or status=no */
 		if (!lp_status(-1))
@@ -207,44 +245,15 @@ void status_page(void)
 	}
 	printf("</tr>\n");
 
-	while (f && !feof(f)) {
-		if (fread(&crec,sizeof(crec),1,f) != 1)
-			break;
-		if (crec.magic == 0x280267 && 
-		    crec.cnum == -1 &&
-		    process_exists(crec.pid)) {
-			printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td>\n",
-			       (int)crec.pid,
-			       crec.machine,crec.addr,
-			       tstring(crec.start));
-			if (geteuid() == 0) {
-			    printf("<td><input type=submit value=\"X\" name=\"kill_%d\"></td>\n",
-			       (int)crec.pid);
-			}
-			printf("</tr>\n");
-		}
-	}
+	if (tdb) tdb_traverse(tdb, traverse_fn2);
 
 	printf("</table><p>\n");
 
-	if (f) fseek(f, 0, SEEK_SET);
-	
 	printf("<p><h3>Active Shares</h3>\n");
 	printf("<table border=1>\n");
 	printf("<tr><th>Share</th><th>User</th><th>Group</th><th>PID</th><th>Client</th><th>Date</th></tr>\n\n");
 
-	while (f && !feof(f)) {
-		if (fread(&crec,sizeof(crec),1,f) != 1)
-			break;
-		if (crec.cnum == -1) continue;
-		if (crec.magic == 0x280267 && process_exists(crec.pid)) {
-			printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td></tr>\n",
-			       crec.name,uidtoname(crec.uid),
-			       gidtoname(crec.gid),(int)crec.pid,
-			       crec.machine,
-			       tstring(crec.start));
-		}
-	}
+	if (tdb) tdb_traverse(tdb, traverse_fn3);
 
 	printf("</table><p>\n");
 
@@ -257,7 +266,7 @@ void status_page(void)
 	locking_end();
 	printf("</table>\n");
 
-	if (f) fclose(f);
+	tdb_close(tdb);
 
 	printf("</FORM>\n");
 
-- 
cgit 


From 4e1291a83f61a72989045879763d9ef05fd38f71 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 21 Dec 1999 09:25:59 +0000
Subject: converted all our existing shared memory code to use a tdb database
 instead of either sysv or mmap shared memory or lock files.

this means we can now completely remove
	locking_shm.c
	locking_slow.c
	shmem.c
	shmem_sysv.c
and lots of other things also got simpler

locking.c got a bit larger, but is much better compartmentalised now
(This used to be commit e48c2d9937eea0667b8cd3332e49c06314ef31e7)
---
 source3/web/statuspage.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 8b7108c0b5..e3e10f09d5 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -128,7 +128,6 @@ static int traverse_fn3(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf)
 /* show the current server status */
 void status_page(void)
 {
-	pstring fname;
 	char *v;
 	int autorefresh=0;
 	int refresh_interval=30;
@@ -173,12 +172,7 @@ void status_page(void)
 		refresh_interval = atoi(v);
 	}
 
-	pstrcpy(fname,lp_lockdir());
-	standard_sub_basic(fname);
-	trim_string(fname,"","/");
-	pstrcat(fname,"/connections.tdb");
-
-	tdb = tdb_open(fname, 0, O_RDONLY, 0);
+	tdb = tdb_open(lock_path("connections.tdb"), 0, O_RDONLY, 0);
 	if (tdb) tdb_traverse(tdb, traverse_fn1);
 
 	printf("<H2>Server Status</H2>\n");
-- 
cgit 


From 9a781a8c6de9513ba5f4cafef41379fae96807c1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 2 Jan 2000 23:00:27 +0000
Subject: - added tdb_flags option to tdb_open() - added TDB_CLEAR_IF_FIRST
 flag to clear the database if this is the   first attached process. Useful
 for non-persistent databases like our   locking area (this will also make
 upgrades to new database layouts easier) - use lock_path() in a couple of
 places - leave connections database open while smbd running - cleaned up some
 tdb code a little, using macros for constants (This used to be commit
 00e9da3ca577527db392aced62f02c69cfee8f4f)

---
 source3/web/statuspage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index e3e10f09d5..eaf3fdb864 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -172,7 +172,7 @@ void status_page(void)
 		refresh_interval = atoi(v);
 	}
 
-	tdb = tdb_open(lock_path("connections.tdb"), 0, O_RDONLY, 0);
+	tdb = tdb_open(lock_path("connections.tdb"), 0, 0, O_RDONLY, 0);
 	if (tdb) tdb_traverse(tdb, traverse_fn1);
 
 	printf("<H2>Server Status</H2>\n");
-- 
cgit 


From 98b1c568af7ed5f738b92a7aae1826856d638046 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 3 Jan 2000 00:32:14 +0000
Subject: fixed active shares display (This used to be commit
 b87d1442db86165d983007dd58647c88ac702abf)

---
 source3/web/statuspage.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index eaf3fdb864..359db5c80a 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -114,7 +114,7 @@ static int traverse_fn3(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf)
 	struct connections_data crec;
 	memcpy(&crec, dbuf.dptr, sizeof(crec));
 
-	if (crec.cnum != -1 || !process_exists(crec.pid)) return 0;
+	if (crec.cnum == -1 || !process_exists(crec.pid)) return 0;
 
 	printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td></tr>\n",
 	       crec.name,uidtoname(crec.uid),
@@ -260,7 +260,7 @@ void status_page(void)
 	locking_end();
 	printf("</table>\n");
 
-	tdb_close(tdb);
+	if (tdb) tdb_close(tdb);
 
 	printf("</FORM>\n");
 
-- 
cgit 


From 574788039f53fada4769731ea3fafe9710417b71 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 3 Jan 2000 03:17:16 +0000
Subject: added the unexpected packet database (unexpected.tdb) this means
 "nmblookup -S" now always works, even with broken servers the database stores
 all unexpected replies and these can be accessed by any client. while doing
 this I cleaned up a couple of functions, and put in place a better trn_id
 generator. in most places the code got quite a bit simpler due to the
 addition of simple helper functions.

I haven't yet put the code in to take advantage of this for pdc
replies - that will be next. Jeremys pdc finding code will then work :)
(This used to be commit 280e6359d36c9bc8dcded302f15c3a1db8e3feeb)
---
 source3/web/diagnose.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index f29e380b93..f22fe0d9b2 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -35,7 +35,7 @@ BOOL nmbd_running(void)
 				 interpret_addr("127.0.0.1"), True)) != -1) {
 		if ((ip_list = name_query(fd, "__SAMBA__", 0, 
 					  True, True, loopback_ip,
-					  &count,0)) != NULL) {
+					  &count)) != NULL) {
 			free(ip_list);
 			close(fd);
 			return True;
-- 
cgit 


From dd9e8074f70f6077ee9aeac262f2a46a5a69bc7b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 7 Jan 2000 08:47:34 +0000
Subject: always restart nmbd and smbd when asked, even if they appear not to
 be responding. They could be stuck (This used to be commit
 8728c0bc94743935cec28caa83d93833ea3aa6a6)

---
 source3/web/statuspage.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 359db5c80a..e9cda3bd70 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -134,8 +134,7 @@ void status_page(void)
 	TDB_CONTEXT *tdb;
 
 	if (cgi_variable("smbd_restart")) {
-		if (smbd_running())
-			stop_smbd();
+		stop_smbd();
 		start_smbd();
 	}
 
@@ -148,8 +147,7 @@ void status_page(void)
 	}
 
 	if (cgi_variable("nmbd_restart")) {
-		if (nmbd_running())
-			stop_nmbd();
+		stop_nmbd();
 		start_nmbd();
 	}
 	if (cgi_variable("nmbd_start")) {
-- 
cgit 


From bbe275e95b86bc7af5a641455cbb379974823f84 Mon Sep 17 00:00:00 2001
From: Luke Leighton <lkcl@samba.org>
Date: Fri, 4 Feb 2000 04:59:31 +0000
Subject: 1) added void* state argument to tdb_traverse.  guess what!  there
 were two places i found where it was appropriate to _use_ that third
 argument, in locking.c and brlock.c!  there was a static traverse_function
 and i removed the static variable, typecast it to a void*, passed it to
 tdb_traverse and re-cast it back to the traverse_function inside the
 tdb_traverse function.  this makes the use of tdb_traverse() reentrant, which
 is never going to happen, i know, i just don't like to see statics lying
 about when there's no need for them.

as i had to do in samba-tng, all uses of tdb_traverse modified to take
the new void* state argument.

2) disabled rpcclient: referring people to use SAMBA_TNG rpcclient.
i don't know how the other samba team members would react if i deleted
rpcclient from cvs main.  damn, that code's so old, it's unreal.
20 rpcclient commands, instead of about 70 in SAMBA_TNG.
(This used to be commit 49d7f0afbc1c5425d53019e234d54ddf205c8e9a)
---
 source3/web/statuspage.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index e9cda3bd70..5c800797c0 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -72,7 +72,7 @@ static void print_share_mode(share_mode_entry *e, char *fname)
 
 
 /* kill off any connections chosen by the user */
-static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf)
+static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* state)
 {
 	struct connections_data crec;
 	memcpy(&crec, dbuf.dptr, sizeof(crec));
@@ -88,7 +88,7 @@ static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf)
 }
 
 /* traversal fn for showing machine connections */
-static int traverse_fn2(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf)
+static int traverse_fn2(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* state)
 {
 	struct connections_data crec;
 	memcpy(&crec, dbuf.dptr, sizeof(crec));
@@ -109,7 +109,7 @@ static int traverse_fn2(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf)
 }
 
 /* traversal fn for showing share connections */
-static int traverse_fn3(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf)
+static int traverse_fn3(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* state)
 {
 	struct connections_data crec;
 	memcpy(&crec, dbuf.dptr, sizeof(crec));
@@ -171,7 +171,7 @@ void status_page(void)
 	}
 
 	tdb = tdb_open(lock_path("connections.tdb"), 0, 0, O_RDONLY, 0);
-	if (tdb) tdb_traverse(tdb, traverse_fn1);
+	if (tdb) tdb_traverse(tdb, traverse_fn1, NULL);
 
 	printf("<H2>Server Status</H2>\n");
 
@@ -237,7 +237,7 @@ void status_page(void)
 	}
 	printf("</tr>\n");
 
-	if (tdb) tdb_traverse(tdb, traverse_fn2);
+	if (tdb) tdb_traverse(tdb, traverse_fn2, NULL);
 
 	printf("</table><p>\n");
 
@@ -245,7 +245,7 @@ void status_page(void)
 	printf("<table border=1>\n");
 	printf("<tr><th>Share</th><th>User</th><th>Group</th><th>PID</th><th>Client</th><th>Date</th></tr>\n\n");
 
-	if (tdb) tdb_traverse(tdb, traverse_fn3);
+	if (tdb) tdb_traverse(tdb, traverse_fn3, NULL);
 
 	printf("</table><p>\n");
 
-- 
cgit 


From 0f1eee5c7ac4031cd2a97524b1f65a24d0d618c2 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 25 Feb 2000 22:25:25 +0000
Subject: client/client.c: libsmb/clientgen.c: Fixes for Win2k smbclient
 browsing. Other fixes implement smbpasswd -x user to delete users. Also
 allows swat to do the same. Jeremy. (This used to be commit
 9f6ad046761adecafba59040baa3abc9f0959e65)

---
 source3/web/swat.c | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 48c3ae07e2..3c9858a3d3 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -44,6 +44,7 @@ static int iNumNonAutoPrintServices = 0;
 #define CHG_S_PASSWD_FLAG "chg_s_passwd_flag"
 #define CHG_R_PASSWD_FLAG "chg_r_passwd_flag"
 #define ADD_USER_FLAG "add_user_flag"
+#define DELETE_USER_FLAG "delete_user_flag"
 #define DISABLE_USER_FLAG "disable_user_flag"
 #define ENABLE_USER_FLAG "enable_user_flag"
 #define RHOST "remote_host"
@@ -617,7 +618,7 @@ change a password either locally or remotely
 *************************************************************/
 static BOOL change_password(const char *remote_machine, char *user_name, 
 			    char *old_passwd, char *new_passwd, 
-			    BOOL add_user, BOOL enable_user, BOOL disable_user)
+				int local_flags)
 {
 	BOOL ret = False;
 	pstring err_str;
@@ -641,8 +642,7 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 		return False;
 	}
 	
-	ret = local_password_change(user_name, False, add_user, enable_user, 
-				     disable_user, False, new_passwd, err_str, sizeof(err_str),
+	ret = local_password_change(user_name, local_flags, new_passwd, err_str, sizeof(err_str),
 					 msg_str, sizeof(msg_str));
 
 	if(*msg_str)
@@ -660,6 +660,7 @@ static void chg_passwd(void)
 {
 	char *host;
 	BOOL rslt;
+	int local_flags = 0;
 
 	/* Make sure users name has been specified */
 	if (strlen(cgi_variable(SWAT_USER)) == 0) {
@@ -668,10 +669,10 @@ static void chg_passwd(void)
 	}
 
 	/*
-	 * smbpasswd doesn't require anything but the users name to disable or enable the user,
+	 * smbpasswd doesn't require anything but the users name to delete, disable or enable the user,
 	 * so if that's what we're doing, skip the rest of the checks
 	 */
-	if (!cgi_variable(DISABLE_USER_FLAG) && !cgi_variable(ENABLE_USER_FLAG)) {
+	if (!cgi_variable(DISABLE_USER_FLAG) && !cgi_variable(ENABLE_USER_FLAG) && !cgi_variable(DELETE_USER_FLAG)) {
 
 		/*
 		 * If current user is not root, make sure old password has been specified 
@@ -710,18 +711,27 @@ static void chg_passwd(void)
 	} else {
 		host = "127.0.0.1";
 	}
+
+	/*
+	 * Set up the local flags.
+	 */
+
+	local_flags |= (cgi_variable(ADD_USER_FLAG) ? LOCAL_ADD_USER : 0);
+	local_flags |= (cgi_variable(DELETE_USER_FLAG) ? LOCAL_DELETE_USER : 0);
+	local_flags |= (cgi_variable(ENABLE_USER_FLAG) ? LOCAL_ENABLE_USER : 0);
+	local_flags |= (cgi_variable(DISABLE_USER_FLAG) ? LOCAL_DISABLE_USER : 0);
+
 	rslt = change_password(host,
 			       cgi_variable(SWAT_USER),
 			       cgi_variable(OLD_PSWD), cgi_variable(NEW_PSWD),
-			       cgi_variable(ADD_USER_FLAG)? True : False,
-			       cgi_variable(ENABLE_USER_FLAG)? True : False,
-			       cgi_variable(DISABLE_USER_FLAG)? True : False);
+				   local_flags);
 
-
-	if (rslt == True) {
-		printf("<p> The passwd for '%s' has been changed. \n", cgi_variable(SWAT_USER));
-	} else {
-		printf("<p> The passwd for '%s' has NOT been changed. \n",cgi_variable(SWAT_USER));
+	if(local_flags == 0) {
+		if (rslt == True) {
+			printf("<p> The passwd for '%s' has been changed. \n", cgi_variable(SWAT_USER));
+		} else {
+			printf("<p> The passwd for '%s' has NOT been changed. \n",cgi_variable(SWAT_USER));
+		}
 	}
 	
 	return;
@@ -773,6 +783,8 @@ static void passwd_page(void)
 	if (demo_mode || am_root()) {
 		printf("<input type=submit name=%s value=\"Add New User\">\n",
 		       ADD_USER_FLAG);
+		printf("<input type=submit name=%s value=\"Delete User\">\n",
+		       DELETE_USER_FLAG);
 		printf("<input type=submit name=%s value=\"Disable User\">\n", 
 		       DISABLE_USER_FLAG);
 		printf("<input type=submit name=%s value=\"Enable User\">\n", 
@@ -784,7 +796,7 @@ static void passwd_page(void)
 	 * Do some work if change, add, disable or enable was
 	 * requested. It could be this is the first time through this
 	 * code, so there isn't anything to do.  */
-	if ((cgi_variable(CHG_S_PASSWD_FLAG)) || (cgi_variable(ADD_USER_FLAG)) ||
+	if ((cgi_variable(CHG_S_PASSWD_FLAG)) || (cgi_variable(ADD_USER_FLAG)) || (cgi_variable(DELETE_USER_FLAG)) ||
 	    (cgi_variable(DISABLE_USER_FLAG)) || (cgi_variable(ENABLE_USER_FLAG))) {
 		chg_passwd();		
 	}
-- 
cgit 


From cdf223083fed0f35549071d141f6257c4a660ca2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 11 Apr 2000 07:14:12 +0000
Subject: two minor bugfixes for SCO UnixWare. The first is to catch SIGPIPE so
 that putmsg() inside their send() doesn't kill swat and the scond is to open
 /dev/null to replace stdin after we close that (This used to be commit
 d35bbe56bc9e3e5896b2ebdf33ff6468a0432e1f)

---
 source3/web/cgi.c  | 1 +
 source3/web/swat.c | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 62a5e71e05..b33feb30c2 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -198,6 +198,7 @@ void cgi_load_variables(FILE *f1)
 	}
 
 	fclose(stdin);
+	open("/dev/null", O_RDWR);
 
 	if ((s=query_string) || (s=getenv("QUERY_STRING"))) {
 		for (tok=strtok(s,"&;");tok;tok=strtok(NULL,"&;")) {
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 3c9858a3d3..54192b70da 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -973,6 +973,9 @@ static void printers_page(void)
 	/* just in case it goes wild ... */
 	alarm(300);
 
+	/* we don't want any SIGPIPE messages */
+	BlockSignals(True,SIGPIPE);
+
 	dbf = sys_fopen("/dev/null", "w");
 	if (!dbf) dbf = stderr;
 
-- 
cgit 


From 2fa922611bf7160e2c1ce80c11b50006448bf98d Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 11 Apr 2000 13:55:53 +0000
Subject: finally got sick of the "extern int Client" code and the stupid
 assumption that we have one socket everywhere

while doing so I discovered a few bugs!

1) the clientgen session retarget code if used from smbd or nmbd would
cause a crash as it called close_sockets() which closed our main
socket! fixed by removing close_sockets() completely - it is unnecessary

2) the caching in client_addr() and client_name() was bogus - it could
easily get fooled and give the wrong result. fixed.

3) the retarget could could recurse, allowing an easy denial of
service attack on nmbd. fixed.
(This used to be commit 5937ab14d222696e40a3fc6f0e6a536f2d7305d3)
---
 source3/web/cgi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index b33feb30c2..ea73a0f1a7 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -504,7 +504,7 @@ void cgi_setup(char *rootdir, int auth_required)
 	f = sys_fopen("/tmp/cgi.log", "a");
 	if (f) fprintf(f,"\n[Date: %s   %s (%s)]\n", 
 		       http_timestring(time(NULL)),
-		       client_name(1), client_addr(1));
+		       get_socket_name(1), get_socket_addr(1));
 #endif
 
 	/* we are a mini-web server. We need to read the request from stdin
@@ -604,7 +604,7 @@ return the hostname of the client
 char *cgi_remote_host(void)
 {
 	if (inetd_server) {
-		return client_name(1);
+		return get_socket_name(1);
 	}
 	return getenv("REMOTE_HOST");
 }
@@ -615,7 +615,7 @@ return the hostname of the client
 char *cgi_remote_addr(void)
 {
 	if (inetd_server) {
-		return client_addr(1);
+		return get_socket_addr(1);
 	}
 	return getenv("REMOTE_ADDR");
 }
-- 
cgit 


From e5e43b553ee12af1add965804dc32d63f5fa2f1e Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 1 Sep 2000 02:06:20 +0000
Subject: Fix for swat to return correct MIME type for text files.  From "Ron
 Alexander" <rcalex@home.com> (This used to be commit
 061e5e50523913a26bc86bd816c4e26a37a832c7)

---
 source3/web/cgi.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index ea73a0f1a7..4f44d10afc 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -451,6 +451,8 @@ static void cgi_download(char *file)
 			printf("Content-Type: image/gif\r\n");
 		} else if (strcmp(p,".jpg")==0) {
 			printf("Content-Type: image/jpeg\r\n");
+		} else if (strcmp(p,".txt")==0) {
+			printf("Content-Type: text/plain\r\n");
 		} else {
 			printf("Content-Type: text/html\r\n");
 		}
-- 
cgit 


From 4aae2b3702bbfb8082fd225652337e18c3c4abf8 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 13 Sep 2000 07:08:09 +0000
Subject: don't show equivalent enum options in swat (This used to be commit
 52074960971995580a03647ac5c638043eb8f5e1)

---
 source3/web/swat.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 54192b70da..29ff28a75a 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -57,7 +57,7 @@ static int iNumNonAutoPrintServices = 0;
 ****************************************************************************/
 static int enum_index(int value, struct enum_list *enumlist)
 {
-int i;
+	int i;
 	for (i=0;enumlist[i].name;i++)
 		if (value == enumlist[i].value) break;
 	return(i);
@@ -65,8 +65,8 @@ int i;
 
 static char *fix_backslash(char *str)
 {
-static char newstring[1024];
-char *p = newstring;
+	static char newstring[1024];
+	char *p = newstring;
 
         while (*str) {
                 if (*str == '\\') {*p++ = '\\';*p++ = '\\';}
@@ -226,8 +226,11 @@ static void show_parameter(int snum, struct parm_struct *parm)
 
 	case P_ENUM:
 		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
-		for (i=0;parm->enum_list[i].name;i++)
-			printf("<option %s>%s",(*(int *)ptr)==parm->enum_list[i].value?"selected":"",parm->enum_list[i].name);
+		for (i=0;parm->enum_list[i].name;i++) {
+			if (i == 0 || parm->enum_list[i].value != parm->enum_list[i-1].value) {
+				printf("<option %s>%s",(*(int *)ptr)==parm->enum_list[i].value?"selected":"",parm->enum_list[i].name);
+			}
+		}
 		printf("</select>");
 		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
 			make_parm_name(parm->label),enum_index((int)(parm->def.ivalue),parm->enum_list));
-- 
cgit 


From 9e70ba71af8253b7b9995b55d9851b73bb58bf78 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 1 Nov 2000 19:43:53 +0000
Subject: Remove CGI logging code. Make username/password lookups take the same
 time. Jeremy. (This used to be commit
 9698f746858f0f2b37ec6494fca990e958d97cb7)

---
 source3/web/cgi.c | 57 +++++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 4f44d10afc..a99b9d3c5d 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -26,8 +26,6 @@
 /* set the expiry on fixed pages */
 #define EXPIRY_TIME (60*60*24*7)
 
-#define CGI_LOGGING 0
-
 #ifdef DEBUG_COMMENTS
 extern void print_title(char *fmt, ...);
 #endif
@@ -327,7 +325,6 @@ static void base64_decode(char *s)
 	d[n] = 0;
 }
 
-
 /***************************************************************************
 handle a http authentication line
   ***************************************************************************/
@@ -336,11 +333,17 @@ static BOOL cgi_handle_authorization(char *line)
 	char *p, *user, *user_pass;
 	struct passwd *pass = NULL;
 	BOOL ret = False;
+	BOOL got_name = False;
+	BOOL tested_pass = False;
+	fstring default_user_lookup;
+	fstring default_user_pass;
+
+	/* Dummy user lookup to take the same time as a valid user. */
+	fstrcpy(default_user_lookup, "zzzz bibble");
+	fstrcpy(default_user_pass, "123456789");
 
 	if (strncasecmp(line,"Basic ", 6)) {
-		cgi_setup_error("401 Bad Authorization", "", 
-				"Only basic authorization is understood");
-		return False;
+		goto err;
 	}
 	line += 6;
 	while (line[0] == ' ') line++;
@@ -350,9 +353,7 @@ static BOOL cgi_handle_authorization(char *line)
 		 * Always give the same error so a cracker
 		 * cannot tell why we fail.
 		 */
-		cgi_setup_error("401 Bad Authorization", "", 
-				"username/password must be supplied");
-		return False;
+		goto err;
 	}
 	*p = 0;
 	user = line;
@@ -367,15 +368,16 @@ static BOOL cgi_handle_authorization(char *line)
 		 * Always give the same error so a cracker
 		 * cannot tell why we fail.
 		 */
-		cgi_setup_error("401 Bad Authorization", "",
-				"username/password must be supplied");
-		return False;
+		got_name = True;
+		goto err;
 	}
 
 	/*
 	 * Validate the password they have given.
 	 */
 
+	tested_pass = True;
+
 	if((ret = pass_check(user, user_pass, strlen(user_pass), NULL, NULL)) == True) {
 
 		/*
@@ -394,7 +396,20 @@ static BOOL cgi_handle_authorization(char *line)
 		C_user = strdup(user);
 	}
 
-	return ret;
+  err:
+
+	/* Always take the same time. */
+	if (!got_name)
+		Get_Pwnam(default_user_lookup,False);
+
+	if (!tested_pass)
+		pass_check(default_user_lookup, default_user_pass,
+					strlen(default_user_pass), NULL, NULL);
+
+	cgi_setup_error("401 Bad Authorization", "", 
+			"username or password incorrect");
+
+	return False;
 }
 
 /***************************************************************************
@@ -478,9 +493,6 @@ void cgi_setup(char *rootdir, int auth_required)
 	char line[1024];
 	char *url=NULL;
 	char *p;
-#if CGI_LOGGING
-	FILE *f;
-#endif
 
 	if (chdir(rootdir)) {
 		cgi_setup_error("400 Server Error", "",
@@ -502,19 +514,9 @@ void cgi_setup(char *rootdir, int auth_required)
 				"Samba is configured to deny access from this client\n<br>Check your \"hosts allow\" and \"hosts deny\" options in smb.conf ");
 	}
 
-#if CGI_LOGGING
-	f = sys_fopen("/tmp/cgi.log", "a");
-	if (f) fprintf(f,"\n[Date: %s   %s (%s)]\n", 
-		       http_timestring(time(NULL)),
-		       get_socket_name(1), get_socket_addr(1));
-#endif
-
 	/* we are a mini-web server. We need to read the request from stdin
 	   and handle authentication etc */
 	while (fgets(line, sizeof(line)-1, stdin)) {
-#if CGI_LOGGING
-		if (f) fputs(line, f);
-#endif
 		if (line[0] == '\r' || line[0] == '\n') break;
 		if (strncasecmp(line,"GET ", 4)==0) {
 			got_request = True;
@@ -534,9 +536,6 @@ void cgi_setup(char *rootdir, int auth_required)
 		}
 		/* ignore all other requests! */
 	}
-#if CGI_LOGGING
-	if (f) fclose(f);
-#endif
 
 	if (auth_required && !authenticated) {
 		cgi_auth_error();
-- 
cgit 


From 0042bf32cc8eddfc0b89799f19bf6cfa05311f99 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 6 Nov 2000 23:08:00 +0000
Subject: Fix to the "known/unknown user" difference patch from "Ron Alexander"
 <rcalex@home.com>. Jeremy. (This used to be commit
 7a698c1f23ea8740755c544f631789848a360e42)

---
 source3/web/cgi.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index a99b9d3c5d..f85ba7bebd 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -394,6 +394,7 @@ static BOOL cgi_handle_authorization(char *line)
 
 		/* Save the users name */
 		C_user = strdup(user);
+		return True;
 	}
 
   err:
-- 
cgit 


From 9fede0dc0dbad51528cd1384023d24549c3f0ba4 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 13 Nov 2000 23:03:34 +0000
Subject: Large commit which restructures the local password storage API.
 Currently the only backend which works is smbpasswd (tdb, LDAP, and NIS+) are
 broken, but they were somewhat broken before. :)

The following functions implement the storage manipulation interface

/*The following definitions come from  passdb/pdb_smbpasswd.c  */

BOOL pdb_setsampwent (BOOL update);
void pdb_endsampwent (void);
SAM_ACCOUNT* pdb_getsampwent (void);
SAM_ACCOUNT* pdb_getsampwnam (char *username);
SAM_ACCOUNT* pdb_getsampwuid (uid_t uid);
SAM_ACCOUNT* pdb_getsampwrid (uint32 rid);
BOOL pdb_add_sam_account (SAM_ACCOUNT *sampass);
BOOL pdb_update_sam_account (SAM_ACCOUNT *sampass, BOOL override);
BOOL pdb_delete_sam_account (char* username);

There is also a host of pdb_set..() and pdb_get..() functions for
manipulating SAM_ACCOUNT struct members.  Note that the struct
passdb_ops {} has gone away.  Also notice that struct smb_passwd
(formally in smb.h) has been moved to passdb/pdb_smbpasswd.c
and is not accessed outisde of static internal functions in this
file.  All local password searches should make use of the the SAM_ACCOUNT
struct and the previously mentioned functions.

I'll write some documentation for this later.  The next step is to fix
the TDB passdb backend, then work on spliting the backends out into
share libraries, and finally get the LDAP backend going.

What works and may not:

	o domain logons from Win9x 	works
	o domain logons from WinNT 4	works
	o user and group enumeration
		as implemented by Tim	works
	o file and print access		works
	o changing password from
		Win9x & NT		ummm...i'll fix this tonight :)

If I broke anything else, just yell and I'll fix it.  I think it
should be fairly quite.





-- jerry
(This used to be commit 0b92d0838ebdbe24f34f17e313ecbf61a0301389)
---
 source3/web/swat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 29ff28a75a..e0936d0741 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -640,8 +640,8 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 		return ret;
 	}
 
-	if(!initialize_password_db()) {
-		printf("Can't setup password database vectors.\n<p>");
+	if(!initialize_password_db(True)) {
+		printf("Can't initialize passdb!\n<p>");
 		return False;
 	}
 	
-- 
cgit 


From 792ca5d98938c3c52ff4e598bcb55056565dc202 Mon Sep 17 00:00:00 2001
From: David O'Neill <dmo@samba.org>
Date: Wed, 17 Jan 2001 18:47:46 +0000
Subject: Changes from APPLIANCE_HEAD:     source/rpc_server/srv_spoolss_nt.c  
       - Unrolled construct_notify_jobs_info() loop to only fetch          
 printer info_2 structure once rather than num_print_jobs times.         -
 convert command to unix codepage.         - remove lp_remove_service() call
 as it prevents lp_killservice()           from working.         - Modified
 some DEBUG and DEBUGADD statements.

    source/param/loadparm.c
    source/param/params.c
        - change printer, preload, auto services to FLAG_DOS_STRING,
          reverted earlier changes to szPrintername et al, add comments.

    source/printing/load.c
        - fix bug with lp_auto_services() and strtok()

    source/printing/nt_printing.c
    source/printing/printing.c
        - remove redundant test that used SERVICE(snum)

    source/printing/pcap.c
        - add unix_to_dos() calls, add notes wrt FIXMEs for
          xxx_printer_fn() functions.

    source/web/swat.c
        - added FIXME comment.

    source/smbd/service.c
        - added comment re: dos codepage
(This used to be commit 7b774b72c2857af9519012106714a9e2cb099da3)
---
 source3/web/swat.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index e0936d0741..d0a78fb243 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -520,7 +520,8 @@ static void globals_page(void)
 }
 
 /****************************************************************************
-  display a shares editing page  
+  display a shares editing page. share is in unix codepage, and must be in
+  dos codepage. FIXME !!! JRA.
 ****************************************************************************/
 static void shares_page(void)
 {
@@ -641,7 +642,7 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 	}
 
 	if(!initialize_password_db(True)) {
-		printf("Can't initialize passdb!\n<p>");
+		printf("Can't setup password database vectors.\n<p>");
 		return False;
 	}
 	
-- 
cgit 


From da3053048c3d224a20d6383ac6682d31059cd46c Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sun, 11 Mar 2001 00:32:10 +0000
Subject: Merge of new 2.2 code into HEAD (Gerald I hate you :-) :-). Allows
 new SAMR RPC code to merge with new passdb code. Currently rpcclient doesn't
 compile. I'm working on it... Jeremy. (This used to be commit
 0be41d5158ea4e645e93e8cd30617c038416e549)

---
 source3/web/cgi.c  | 3 +--
 source3/web/swat.c | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index f85ba7bebd..e4fda2d99c 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -332,7 +332,6 @@ static BOOL cgi_handle_authorization(char *line)
 {
 	char *p, *user, *user_pass;
 	struct passwd *pass = NULL;
-	BOOL ret = False;
 	BOOL got_name = False;
 	BOOL tested_pass = False;
 	fstring default_user_lookup;
@@ -378,7 +377,7 @@ static BOOL cgi_handle_authorization(char *line)
 
 	tested_pass = True;
 
-	if((ret = pass_check(user, user_pass, strlen(user_pass), NULL, NULL)) == True) {
+	if(pass_check(user, user_pass, strlen(user_pass), NULL, NULL) == True) {
 
 		/*
 		 * Password was ok.
diff --git a/source3/web/swat.c b/source3/web/swat.c
index d0a78fb243..1e8d23f6e3 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -50,8 +50,8 @@ static int iNumNonAutoPrintServices = 0;
 #define RHOST "remote_host"
 
 /* we need these because we link to locking*.o */
- void become_root(BOOL save_dir) {}
- void unbecome_root(BOOL restore_dir) {}
+ void become_root(void) {}
+ void unbecome_root(void) {}
 
 /****************************************************************************
 ****************************************************************************/
-- 
cgit 


From 1452c2d8c4a2124e4c97bb51a1e58bcfda620ef0 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 26 Mar 2001 23:13:02 +0000
Subject: Fix from Ryo Kawahara <rkawa@lbe.co.jp> to make SWAT correctly write
 and smb.conf file in utf8. Jeremy. (This used to be commit
 42052d6079479452aa43eb37ad3d679d28337779)

---
 source3/web/swat.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 1e8d23f6e3..9817327618 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -326,13 +326,13 @@ static BOOL load_config(BOOL save_def)
 /****************************************************************************
   write a config file 
 ****************************************************************************/
-static void write_config(FILE *f, BOOL show_defaults)
+static void write_config(FILE *f, BOOL show_defaults, char *(*dos_to_ext)(char *, BOOL))
 {
 	fprintf(f, "# Samba config file created using SWAT\n");
 	fprintf(f, "# from %s (%s)\n", cgi_remote_host(), cgi_remote_addr());
 	fprintf(f, "# Date: %s\n\n", timestring(False));
 	
-	lp_dump(f, show_defaults, iNumNonAutoPrintServices);	
+	lp_dump(f, show_defaults, iNumNonAutoPrintServices, dos_to_ext);	
 }
 
 /****************************************************************************
@@ -348,9 +348,9 @@ static int save_reload(int snum)
 		return 0;
 	}
 
-	write_config(f, False);
+	write_config(f, False, _dos_to_unix);
 	if (snum)
-		lp_dump_one(f, False, snum);
+		lp_dump_one(f, False, snum, _dos_to_unix);
 	fclose(f);
 
 	lp_killunused(NULL);
@@ -373,6 +373,10 @@ static void commit_parameter(int snum, struct parm_struct *parm, char *v)
 	int i;
 	char *s;
 
+	/* lp_do_parameter() will do unix_to_dos(v). */
+	if(parm->flags & FLAG_DOS_STRING)
+		dos_to_unix(v, True);
+
 	if (snum < 0 && parm->class == P_LOCAL) {
 		/* this handles the case where we are changing a local
 		   variable globally. We need to change the parameter in 
@@ -472,7 +476,7 @@ static void viewconfig_page(void)
 	}
 
 	printf("<p><pre>");
-	write_config(stdout, full_view);
+	write_config(stdout, full_view, _dos_to_dos);
 	printf("</pre>");
 	printf("</form>\n");
 }
@@ -552,8 +556,12 @@ static void shares_page(void)
 	}
 
 	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
+		/* add_a_service() which is called by lp_copy_service()
+			will do unix_to_dos() conversion, so we need dos_to_unix() before the lp_copy_service(). */
+		pstring unix_share;
+		pstrcpy(unix_share, dos_to_unix(share, False));
 		load_config(False);
-		lp_copy_service(GLOBALS_SNUM, share);
+		lp_copy_service(GLOBALS_SNUM, unix_share);
 		iNumNonAutoPrintServices = lp_numservices();
 		save_reload(0);
 		snum = lp_servicenumber(share);
@@ -887,8 +895,12 @@ static void printers_page(void)
 	}
 
 	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
+		/* add_a_service() which is called by lp_copy_service()
+			will do unix_to_dos() conversion, so we need dos_to_unix() before the lp_copy_service(). */
+		pstring unix_share;
+		pstrcpy(unix_share, dos_to_unix(share, False));
 		load_config(False);
-		lp_copy_service(GLOBALS_SNUM, share);
+		lp_copy_service(GLOBALS_SNUM, unix_share);
 		iNumNonAutoPrintServices = lp_numservices();
 		snum = lp_servicenumber(share);
 		lp_do_parameter(snum, "print ok", "Yes");
-- 
cgit 


From 72aa0d8073258a691d34b7aa4824a48ce90308c6 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 5 Apr 2001 21:31:12 +0000
Subject: Setup syslog correctly in swat. Patch from Andrew Bartlett. Jeremy.
 (This used to be commit ffd9bf192273370c1ebf6f1a2d5ebe8d8c434133)

---
 source3/web/swat.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 9817327618..f1a89f1913 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1010,6 +1010,7 @@ static void printers_page(void)
 		}
 	}
 
+	setup_logging(argv[0],False);
 	charset_initialise();
 	load_config(True);
 	iNumNonAutoPrintServices = lp_numservices();
-- 
cgit 


From 71ef4e018348df03bba429ebf4b323e35b773e86 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 12 Apr 2001 05:24:57 +0000
Subject: fix broken links in SWAT due to upper case anchors in the generated
 HTML man pages.  Spotted by Herb. (This used to be commit
 be45c82c3ab3b626cd761f2cec3b160df2b7fcac)

---
 source3/web/swat.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index f1a89f1913..0497eeb12a 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -161,13 +161,16 @@ static void show_parameter(int snum, struct parm_struct *parm)
 {
 	int i;
 	void *ptr = parm->ptr;
+	char* str;
 
 	if (parm->class == P_LOCAL && snum >= 0) {
 		ptr = lp_local_ptr(snum, ptr);
 	}
 
+	str = stripspace(parm->label);
+	strupper (str);
 	printf("<tr><td><A HREF=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\">Help</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s</td><td>", 
-	       stripspace(parm->label), parm->label);
+	       str, parm->label);
 
 	switch (parm->type) {
 	case P_CHAR:
@@ -873,7 +876,7 @@ static void printers_page(void)
 	printf("<H3>Important Note:</H3>\n");
 	printf("Printer names marked with [*] in the Choose Printer drop-down box ");
 	printf("are autoloaded printers from ");
-	printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">Printcap Name</A>.\n");
+	printf("<A HREF=\"/swat/help/smb.conf.5.html#PRINTCAPNAME\" target=\"docs\">Printcap Name</A>.\n");
 	printf("Attempting to delete these printers from SWAT will have no effect.\n");
 
 	if (cgi_variable("Advanced") && !cgi_variable("Basic"))
-- 
cgit 


From 6056766247fc2e7206d6bb13ad1ac467663ac298 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 7 May 2001 03:55:54 +0000
Subject: merge some fixes from 2.2 (This used to be commit
 7e57adf2a039cb5b6458496f9190c9c642645600)

---
 source3/web/statuspage.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 5c800797c0..27a40d1695 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 
+static pid_t smbd_pid;
 
 static char *tstring(time_t t)
 {
@@ -93,7 +94,8 @@ static int traverse_fn2(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 	struct connections_data crec;
 	memcpy(&crec, dbuf.dptr, sizeof(crec));
 	
-	if (crec.cnum != -1 || !process_exists(crec.pid)) return 0;
+	if (crec.cnum != -1 || !process_exists(crec.pid) ||
+	    (crec.pid == smbd_pid)) return 0;
 
 	printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td>\n",
 	       (int)crec.pid,
@@ -133,6 +135,8 @@ void status_page(void)
 	int refresh_interval=30;
 	TDB_CONTEXT *tdb;
 
+	smbd_pid = pidfile_pid("smbd");
+
 	if (cgi_variable("smbd_restart")) {
 		stop_smbd();
 		start_smbd();
-- 
cgit 


From 10211f53f9fa9e21a6ededf892b8be27bad9643e Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 15 May 2001 18:12:02 +0000
Subject: Check sizes of data entries in connections.tdb before deciding
 they're crecs... We will need this when we use finer grained locking for max
 connections. Jeremy. (This used to be commit
 c6cd42a6791e26174eb795fd08ddbbd797e5a9cf)

---
 source3/web/statuspage.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 27a40d1695..51f2e8f00e 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -1,6 +1,6 @@
 /* 
    Unix SMB/Netbios implementation.
-   Version 1.9.
+   Version 2.2.
    web status page
    Copyright (C) Andrew Tridgell 1997-1998
    
@@ -76,6 +76,10 @@ static void print_share_mode(share_mode_entry *e, char *fname)
 static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* state)
 {
 	struct connections_data crec;
+
+	if (dbuf.dsize != sizeof(crec))
+		return 0;
+
 	memcpy(&crec, dbuf.dptr, sizeof(crec));
 
 	if (crec.cnum == -1 && process_exists(crec.pid)) {
@@ -92,10 +96,14 @@ static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 static int traverse_fn2(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* state)
 {
 	struct connections_data crec;
+
+	if (dbuf.dsize != sizeof(crec))
+		return 0;
+
 	memcpy(&crec, dbuf.dptr, sizeof(crec));
 	
-	if (crec.cnum != -1 || !process_exists(crec.pid) ||
-	    (crec.pid == smbd_pid)) return 0;
+	if (crec.cnum != -1 || !process_exists(crec.pid) || (crec.pid == smbd_pid))
+		return 0;
 
 	printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td>\n",
 	       (int)crec.pid,
@@ -114,9 +122,14 @@ static int traverse_fn2(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 static int traverse_fn3(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* state)
 {
 	struct connections_data crec;
+
+	if (dbuf.dsize != sizeof(crec))
+		return 0;
+
 	memcpy(&crec, dbuf.dptr, sizeof(crec));
 
-	if (crec.cnum == -1 || !process_exists(crec.pid)) return 0;
+	if (crec.cnum == -1 || !process_exists(crec.pid))
+		return 0;
 
 	printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td></tr>\n",
 	       crec.name,uidtoname(crec.uid),
@@ -278,4 +291,3 @@ void status_page(void)
 		printf("//-->\n</script>\n");
 	}
 }
-
-- 
cgit 


From ed585b91eb2be5bff000c715ff11447d3aaa0cb0 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 17 May 2001 11:45:58 +0000
Subject: - added ability for swat to run under CGI. This needs   to be setup
 very carefully for it not to be a security hole - reran configure (This used
 to be commit cf4e439a1e0f3fadbe08c474e5b201827866d7f5)

---
 source3/web/cgi.c | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index e4fda2d99c..07f84b2a61 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -292,6 +292,36 @@ static void cgi_auth_error(void)
 	exit(0);
 }
 
+/***************************************************************************
+authenticate when we are running as a CGI
+  ***************************************************************************/
+static void cgi_web_auth(void)
+{
+	char *user = getenv("REMOTE_USER");
+	struct passwd *pwd;
+	char *head = "Content-Type: text/html\r\n\r\n<HTML><BODY><H1>SWAT installation Error</H1>\n";
+	char *tail = "</BODY></HTML>\r\n";
+
+	if (!user) {
+		printf("%sREMOTE_USER not set. Not authenticated by web server.<br>%s\n",
+		       head, tail);
+		exit(0);
+	}
+
+	pwd = getpwnam(user);
+	if (!pwd) {
+		printf("%sCannot find user %s<br>%s\n", head, user, tail);
+		exit(0);
+	}
+
+	setuid(0);
+	setuid(pwd->pw_uid);
+	if (geteuid() != pwd->pw_uid || getuid() != pwd->pw_uid) {
+		printf("%sFailed to become user %s - uid=%d/%d<br>%s\n", 
+		       head, user, (int)geteuid(), (int)getuid(), tail);
+		exit(0);
+	}
+}
 
 /***************************************************************************
 decode a base64 string in-place - simple and slow algorithm
@@ -483,6 +513,8 @@ static void cgi_download(char *file)
 }
 
 
+
+
 /***************************************************************************
 setup the cgi framework, handling the possability that this program is either
 run as a true cgi program by a web browser or is itself a mini web server
@@ -502,7 +534,7 @@ void cgi_setup(char *rootdir, int auth_required)
 	/* maybe we are running under a web server */
 	if (getenv("CONTENT_LENGTH") || getenv("REQUEST_METHOD")) {
 		if (auth_required) {
-			cgi_auth_error();
+			cgi_web_auth();
 		}
 		return;
 	}
-- 
cgit 


From 5e6bbdb74e3778598c0638fbd1322dfae9351700 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 28 May 2001 23:56:56 +0000
Subject: make sure the umask is set in swat (This used to be commit
 07c74fe83f77c73ff937a31b7df2f211596e9861)

---
 source3/web/swat.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 0497eeb12a..9126d05914 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -345,6 +345,8 @@ static int save_reload(int snum)
 {
 	FILE *f;
 
+	umask(022);
+
 	f = sys_fopen(servicesf,"w");
 	if (!f) {
 		printf("failed to open %s for writing\n", servicesf);
-- 
cgit 


From aded7fc8580c0837ad195f652864b9b7481d60ab Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 30 May 2001 03:02:47 +0000
Subject: Add border=0 in included swat images to get rid of the link border
 stuff. Much prettier looking. (This used to be commit
 16031364a8ce20cf425c758d3fd5035a776e9d9b)

---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 9126d05914..b25641909f 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -421,7 +421,7 @@ static void commit_parameters(int snum)
 ****************************************************************************/
 static void image_link(char *name,char *hlink, char *src)
 {
-	printf("<A HREF=\"%s/%s\"><img src=\"/swat/%s\" alt=\"%s\"></A>\n", 
+	printf("<A HREF=\"%s/%s\"><img border=\"0\" src=\"/swat/%s\" alt=\"%s\"></A>\n", 
 	       cgi_baseurl(), hlink, src, name);
 }
 
-- 
cgit 


From 8bfcdd723d0840d49f6bfb5576e631215aabfc50 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 30 May 2001 06:12:21 +0000
Subject: make swat recover from previously bad umask from xinetd (This used to
 be commit 045d7e1b167efc75bb3d411b3fcc35bba58c4ef7)

---
 source3/web/swat.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index b25641909f..71239d5681 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -344,8 +344,7 @@ static void write_config(FILE *f, BOOL show_defaults, char *(*dos_to_ext)(char *
 static int save_reload(int snum)
 {
 	FILE *f;
-
-	umask(022);
+	struct stat st;
 
 	f = sys_fopen(servicesf,"w");
 	if (!f) {
@@ -353,6 +352,12 @@ static int save_reload(int snum)
 		return 0;
 	}
 
+	/* just in case they have used the buggy xinetd to create the file */
+	if (fstat(fileno(f), &st) == 0 &&
+	    (st.st_mode & S_IWOTH)) {
+		fchmod(fileno(f), S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
+	}
+
 	write_config(f, False, _dos_to_unix);
 	if (snum)
 		lp_dump_one(f, False, snum, _dos_to_unix);
@@ -986,6 +991,7 @@ static void printers_page(void)
 	char *page;
 
 	fault_setup(NULL);
+	umask(S_IWGRP | S_IWOTH);
 
 #if defined(HAVE_SET_AUTH_PARAMETERS)
 	set_auth_parameters(argc, argv);
-- 
cgit 


From 05fc3e578c895f632b351969d09cd00feb7599c7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 4 Jun 2001 05:13:59 +0000
Subject: use LDSHFLAGS not -shared in several places (This used to be commit
 8ec9c87b5d1a7dae17d5b1a30f58effaf5e69e4b)

---
 source3/web/statuspage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 51f2e8f00e..f3b07425b7 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -187,7 +187,7 @@ void status_page(void)
 		refresh_interval = atoi(v);
 	}
 
-	tdb = tdb_open(lock_path("connections.tdb"), 0, 0, O_RDONLY, 0);
+	tdb = tdb_open_log(lock_path("connections.tdb"), 0, 0, O_RDONLY, 0);
 	if (tdb) tdb_traverse(tdb, traverse_fn1, NULL);
 
 	printf("<H2>Server Status</H2>\n");
-- 
cgit 


From 5be670074e908781ff67d3cbbce35b3e61b2058a Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sat, 23 Jun 2001 15:01:34 +0000
Subject: handle P_LIST parameters (This used to be commit
 26ab608c91c7357df3a79bc34111194f115de005)

---
 source3/web/swat.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 71239d5681..262e7ef4c8 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -180,6 +180,27 @@ static void show_parameter(int snum, struct parm_struct *parm)
 			make_parm_name(parm->label),(char)(parm->def.cvalue));
 		break;
 
+	case P_LIST:
+		printf("<input type=text size=40 name=\"parm_%s\" value=\"",
+			make_parm_name(parm->label));
+		if (ptr) {
+			char** list = ptr;
+			for (;*list;list++) {
+				printf("%s%s", *list, ((*(list+1))?" ":""));
+			}
+		}
+		printf("\">");
+		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'",
+			make_parm_name(parm->label));
+		if (parm->def.lvalue) {
+			char **list = parm->def.lvalue;
+			for (; *list; list++) {
+				printf("%s%s", *list, ((*(list+1))?" ":""));
+			}
+		}
+		printf("\'\">");
+		break;
+
 	case P_STRING:
 	case P_USTRING:
 		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
@@ -279,6 +300,10 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 					if (*(char *)ptr == (char)(parm->def.cvalue)) continue;
 					break;
 
+				case P_LIST:
+					if (!lp_list_compare(*(char ***)ptr,(char **)(parm->def.lvalue))) continue;
+					break;
+
 				case P_STRING:
 				case P_USTRING:
 					if (!strcmp(*(char **)ptr,(char *)(parm->def.svalue))) continue;
-- 
cgit 


From 2b8e2f16c39392f0915616142c11feab80852f27 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sat, 23 Jun 2001 15:27:04 +0000
Subject: uhm some pointer went wrong (This used to be commit
 d0acacfc9df86abab24420f1807b4d5253e8c285)

---
 source3/web/swat.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 262e7ef4c8..8374cd445a 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -183,8 +183,8 @@ static void show_parameter(int snum, struct parm_struct *parm)
 	case P_LIST:
 		printf("<input type=text size=40 name=\"parm_%s\" value=\"",
 			make_parm_name(parm->label));
-		if (ptr) {
-			char** list = ptr;
+		if ((char ***)ptr && *(char ***)ptr && **(char ***)ptr) {
+			char **list = *(char ***)ptr;
 			for (;*list;list++) {
 				printf("%s%s", *list, ((*(list+1))?" ":""));
 			}
@@ -193,7 +193,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'",
 			make_parm_name(parm->label));
 		if (parm->def.lvalue) {
-			char **list = parm->def.lvalue;
+			char **list = (char **)(parm->def.lvalue);
 			for (; *list; list++) {
 				printf("%s%s", *list, ((*(list+1))?" ":""));
 			}
@@ -301,7 +301,7 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 					break;
 
 				case P_LIST:
-					if (!lp_list_compare(*(char ***)ptr,(char **)(parm->def.lvalue))) continue;
+					if (!lp_list_compare(*(char ***)ptr, (char **)(parm->def.lvalue))) continue;
 					break;
 
 				case P_STRING:
-- 
cgit 


From 87fbb7092b8f8b2f0db0f361c3d625e19de57cd9 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 4 Jul 2001 07:15:53 +0000
Subject: The big character set handling changeover!

This commit gets rid of all our old codepage handling and replaces it with
iconv. All internal strings in Samba are now in "unix" charset, which may
be multi-byte. See internals.doc and my posting to samba-technical for
a more complete explanation.
(This used to be commit debb471267960e56005a741817ebd227ecfc512a)
---
 source3/web/statuspage.c |  2 +-
 source3/web/swat.c       | 27 +++++++--------------------
 2 files changed, 8 insertions(+), 21 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index f3b07425b7..2efc37a051 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -68,7 +68,7 @@ static void print_share_mode(share_mode_entry *e, char *fname)
 	printf("</td>");
 
 	printf("<td>%s</td><td>%s</td></tr>\n",
-	       dos_to_unix(fname,False),tstring(e->time.tv_sec));
+	       fname,tstring(e->time.tv_sec));
 }
 
 
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 8374cd445a..5dcfe3d658 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -354,13 +354,13 @@ static BOOL load_config(BOOL save_def)
 /****************************************************************************
   write a config file 
 ****************************************************************************/
-static void write_config(FILE *f, BOOL show_defaults, char *(*dos_to_ext)(char *, BOOL))
+static void write_config(FILE *f, BOOL show_defaults)
 {
 	fprintf(f, "# Samba config file created using SWAT\n");
 	fprintf(f, "# from %s (%s)\n", cgi_remote_host(), cgi_remote_addr());
 	fprintf(f, "# Date: %s\n\n", timestring(False));
 	
-	lp_dump(f, show_defaults, iNumNonAutoPrintServices, dos_to_ext);	
+	lp_dump(f, show_defaults, iNumNonAutoPrintServices);
 }
 
 /****************************************************************************
@@ -383,9 +383,9 @@ static int save_reload(int snum)
 		fchmod(fileno(f), S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
 	}
 
-	write_config(f, False, _dos_to_unix);
+	write_config(f, False);
 	if (snum)
-		lp_dump_one(f, False, snum, _dos_to_unix);
+		lp_dump_one(f, False, snum);
 	fclose(f);
 
 	lp_killunused(NULL);
@@ -408,10 +408,6 @@ static void commit_parameter(int snum, struct parm_struct *parm, char *v)
 	int i;
 	char *s;
 
-	/* lp_do_parameter() will do unix_to_dos(v). */
-	if(parm->flags & FLAG_DOS_STRING)
-		dos_to_unix(v, True);
-
 	if (snum < 0 && parm->class == P_LOCAL) {
 		/* this handles the case where we are changing a local
 		   variable globally. We need to change the parameter in 
@@ -511,7 +507,7 @@ static void viewconfig_page(void)
 	}
 
 	printf("<p><pre>");
-	write_config(stdout, full_view, _dos_to_dos);
+	write_config(stdout, full_view);
 	printf("</pre>");
 	printf("</form>\n");
 }
@@ -591,12 +587,8 @@ static void shares_page(void)
 	}
 
 	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
-		/* add_a_service() which is called by lp_copy_service()
-			will do unix_to_dos() conversion, so we need dos_to_unix() before the lp_copy_service(). */
-		pstring unix_share;
-		pstrcpy(unix_share, dos_to_unix(share, False));
 		load_config(False);
-		lp_copy_service(GLOBALS_SNUM, unix_share);
+		lp_copy_service(GLOBALS_SNUM, share);
 		iNumNonAutoPrintServices = lp_numservices();
 		save_reload(0);
 		snum = lp_servicenumber(share);
@@ -930,12 +922,8 @@ static void printers_page(void)
 	}
 
 	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
-		/* add_a_service() which is called by lp_copy_service()
-			will do unix_to_dos() conversion, so we need dos_to_unix() before the lp_copy_service(). */
-		pstring unix_share;
-		pstrcpy(unix_share, dos_to_unix(share, False));
 		load_config(False);
-		lp_copy_service(GLOBALS_SNUM, unix_share);
+		lp_copy_service(GLOBALS_SNUM, share);
 		iNumNonAutoPrintServices = lp_numservices();
 		snum = lp_servicenumber(share);
 		lp_do_parameter(snum, "print ok", "Yes");
@@ -1047,7 +1035,6 @@ static void printers_page(void)
 	}
 
 	setup_logging(argv[0],False);
-	charset_initialise();
 	load_config(True);
 	iNumNonAutoPrintServices = lp_numservices();
 	load_printers();
-- 
cgit 


From 527e824293ee934ca5da0ef5424efe5ab7757248 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 4 Jul 2001 07:36:09 +0000
Subject: strchr and strrchr are macros when compiling with optimisation in
 gcc, so we can't redefine them. damn. (This used to be commit
 c41fc06376d1a2b83690612304e85010b5e5f3cf)

---
 source3/web/cgi.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 07f84b2a61..af9d2ea8f6 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -50,12 +50,12 @@ static void unescape(char *buf)
 {
 	char *p=buf;
 
-	while ((p=strchr(p,'+')))
+	while ((p=strchr_m(p,'+')))
 		*p = ' ';
 
 	p = buf;
 
-	while (p && *p && (p=strchr(p,'%'))) {
+	while (p && *p && (p=strchr_m(p,'%'))) {
 		int c1 = p[1];
 		int c2 = p[2];
 
@@ -104,7 +104,7 @@ static char *grab_line(FILE *f, int *cl)
 		
 		if (c == '\r') continue;
 
-		if (strchr("\n&", c)) break;
+		if (strchr_m("\n&", c)) break;
 
 		ret[i++] = c;
 
@@ -160,7 +160,7 @@ void cgi_load_variables(FILE *f1)
 	     ((s=getenv("REQUEST_METHOD")) && 
 	      strcasecmp(s,"POST")==0))) {
 		while (len && (line=grab_line(f, &len))) {
-			p = strchr(line,'=');
+			p = strchr_m(line,'=');
 			if (!p) continue;
 			
 			*p = 0;
@@ -200,7 +200,7 @@ void cgi_load_variables(FILE *f1)
 
 	if ((s=query_string) || (s=getenv("QUERY_STRING"))) {
 		for (tok=strtok(s,"&;");tok;tok=strtok(NULL,"&;")) {
-			p = strchr(tok,'=');
+			p = strchr_m(tok,'=');
 			if (!p) continue;
 			
 			*p = 0;
@@ -335,7 +335,7 @@ static void base64_decode(char *s)
 
 	n=i=0;
 
-	while (*s && (p=strchr(b64,*s))) {
+	while (*s && (p=strchr_m(b64,*s))) {
 		idx = (int)(p - b64);
 		byte_offset = (i*6)/8;
 		bit_offset = (i*6)%8;
@@ -377,7 +377,7 @@ static BOOL cgi_handle_authorization(char *line)
 	line += 6;
 	while (line[0] == ' ') line++;
 	base64_decode(line);
-	if (!(p=strchr(line,':'))) {
+	if (!(p=strchr_m(line,':'))) {
 		/*
 		 * Always give the same error so a cracker
 		 * cannot tell why we fail.
@@ -475,7 +475,7 @@ static void cgi_download(char *file)
 
 	/* sanitise the filename */
 	for (i=0;file[i];i++) {
-		if (!isalnum((int)file[i]) && !strchr("/.-_", file[i])) {
+		if (!isalnum((int)file[i]) && !strchr_m("/.-_", file[i])) {
 			cgi_setup_error("404 File Not Found","",
 					"Illegal character in filename");
 		}
@@ -491,7 +491,7 @@ static void cgi_download(char *file)
 				"The requested file was not found");
 	}
 	printf("HTTP/1.0 200 OK\r\n");
-	if ((p=strrchr(file,'.'))) {
+	if ((p=strrchr_m(file,'.'))) {
 		if (strcmp(p,".gif")==0) {
 			printf("Content-Type: image/gif\r\n");
 		} else if (strcmp(p,".jpg")==0) {
@@ -579,15 +579,15 @@ void cgi_setup(char *rootdir, int auth_required)
 	}
 
 	/* trim the URL */
-	if ((p = strchr(url,' ')) || (p=strchr(url,'\t'))) {
+	if ((p = strchr_m(url,' ')) || (p=strchr_m(url,'\t'))) {
 		*p = 0;
 	}
-	while (*url && strchr("\r\n",url[strlen(url)-1])) {
+	while (*url && strchr_m("\r\n",url[strlen(url)-1])) {
 		url[strlen(url)-1] = 0;
 	}
 
 	/* anything following a ? in the URL is part of the query string */
-	if ((p=strchr(url,'?'))) {
+	if ((p=strchr_m(url,'?'))) {
 		query_string = p+1;
 		*p = 0;
 	}
-- 
cgit 


From 5b8d230e39cedda6117cf8528065cbab45bdd835 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 8 Jul 2001 14:10:30 +0000
Subject: This removes unused paramaters from various authtication functions,
 and should not change behaviour.

This should make my later diffs smaller, where I actualy start cleaning up this
mess...

Andrew Bartlett
(This used to be commit 04f090c224bb7ac3b53c430a591fce1fc939a81c)
---
 source3/web/cgi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index af9d2ea8f6..e47514904b 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -407,7 +407,7 @@ static BOOL cgi_handle_authorization(char *line)
 
 	tested_pass = True;
 
-	if(pass_check(user, user_pass, strlen(user_pass), NULL, NULL) == True) {
+	if(pass_check(user, user_pass, strlen(user_pass), NULL) == True) {
 
 		/*
 		 * Password was ok.
@@ -434,7 +434,7 @@ static BOOL cgi_handle_authorization(char *line)
 
 	if (!tested_pass)
 		pass_check(default_user_lookup, default_user_pass,
-					strlen(default_user_pass), NULL, NULL);
+					strlen(default_user_pass), NULL);
 
 	cgi_setup_error("401 Bad Authorization", "", 
 			"username or password incorrect");
-- 
cgit 


From 996719cce26700c68ff0e456e6a25d20085d091f Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 30 Jul 2001 22:21:31 +0000
Subject: Added "use mmap" for HPUX. Jeremy. (This used to be commit
 840802f10677cb0009cb4df4c37c7d01aa5edacd)

---
 source3/web/statuspage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 2efc37a051..dc26e86ef8 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -187,7 +187,7 @@ void status_page(void)
 		refresh_interval = atoi(v);
 	}
 
-	tdb = tdb_open_log(lock_path("connections.tdb"), 0, 0, O_RDONLY, 0);
+	tdb = tdb_open_log(lock_path("connections.tdb"), 0, USE_TDB_MMAP_FLAG, O_RDONLY, 0);
 	if (tdb) tdb_traverse(tdb, traverse_fn1, NULL);
 
 	printf("<H2>Server Status</H2>\n");
-- 
cgit 


From 2f844bf447a98b802daa4b8d552ea4530e7f6108 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Wed, 8 Aug 2001 16:54:16 +0000
Subject: Change all realloc() statements to Realloc() (ecxept for tdb.c)
 changed some code to exploit the fact that Realloc(NULL, size) ==
 malloc(size) fixed some possible mem leaks, or seg faults.

thanks to andreas moroder (mallocs not checked in client/client.c, client/smbumount.c)
(This used to be commit 7f33c01688b825ab2fa9bbb2730bff4f2fa352be)
---
 source3/web/cgi.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index e47514904b..74e9969ff4 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -85,16 +85,23 @@ static void unescape(char *buf)
 
 static char *grab_line(FILE *f, int *cl)
 {
-	char *ret;
+	char *ret = NULL;
 	int i = 0;
 	int len = 1024;
 
-	ret = (char *)malloc(len);
-	if (!ret) return NULL;
-	
-
 	while ((*cl)) {
-		int c = fgetc(f);
+		int c;
+	
+		if (i == len) {
+			char *ret2;
+			if (len == 0) len = 1024;
+			else len *= 2;
+			ret2 = (char *)Realloc(ret, len*2);
+			if (!ret2) return ret;
+			ret = ret2;
+		}
+	
+		c = fgetc(f);
 		(*cl)--;
 
 		if (c == EOF) {
@@ -108,13 +115,6 @@ static char *grab_line(FILE *f, int *cl)
 
 		ret[i++] = c;
 
-		if (i == len-1) {
-			char *ret2;
-			ret2 = (char *)realloc(ret, len*2);
-			if (!ret2) return ret;
-			len *= 2;
-			ret = ret2;
-		}
 	}
 	
 
-- 
cgit 


From 9644bf74bd90ef5b9c016434408be1acaa311978 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 12 Aug 2001 09:18:31 +0000
Subject: it was half committed last time, thanks to Hasch@t-online.de (Juergen
 Hasch) for spotting that. (This used to be commit
 a2a4d4e6286c2127b6f8e32fc97b96dabd7cdb40)

---
 source3/web/cgi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 74e9969ff4..651cd3d8c3 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -87,7 +87,7 @@ static char *grab_line(FILE *f, int *cl)
 {
 	char *ret = NULL;
 	int i = 0;
-	int len = 1024;
+	int len = 0;
 
 	while ((*cl)) {
 		int c;
@@ -96,7 +96,7 @@ static char *grab_line(FILE *f, int *cl)
 			char *ret2;
 			if (len == 0) len = 1024;
 			else len *= 2;
-			ret2 = (char *)Realloc(ret, len*2);
+			ret2 = (char *)Realloc(ret, len);
 			if (!ret2) return ret;
 			ret = ret2;
 		}
-- 
cgit 


From 2051bb7d0366e07c5ecda5e5f7cfedc4153d6228 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 22 Aug 2001 19:11:55 +0000
Subject: A few changes: drop paramaters:  status  utmp hostname

change session code to always record each vuid current on the server.  The sessionid struct is no longer packed, as I couldn't get that to work ;-)

change smbstatus to show this info and less of the connections.tdb info (its not actualy that accurate).

I'll get swat doing some of this shortly.
(This used to be commit b068ad300527c44673bbee0aede7849199c89de7)
---
 source3/web/statuspage.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index dc26e86ef8..c112deb224 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -209,9 +209,7 @@ void status_page(void)
 
 	if (!tdb) {
 		/* open failure either means no connections have been
-                   made or status=no */
-		if (!lp_status(-1))
-			printf("You need to have status=yes in your smb config file\n");
+                   made */
 	}
 
 
-- 
cgit 


From 9a9ac2739bbdc993ecdfa78298bdd9c059328378 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 6 Sep 2001 22:08:19 +0000
Subject: got rid of USE_TDB_MMAP_FLAG as its not needed any more (This used to
 be commit c26e0d3f27a05ecc8bd2390f9aab7f9451524e47)

---
 source3/web/statuspage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index c112deb224..e930629eee 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -187,7 +187,7 @@ void status_page(void)
 		refresh_interval = atoi(v);
 	}
 
-	tdb = tdb_open_log(lock_path("connections.tdb"), 0, USE_TDB_MMAP_FLAG, O_RDONLY, 0);
+	tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
 	if (tdb) tdb_traverse(tdb, traverse_fn1, NULL);
 
 	printf("<H2>Server Status</H2>\n");
-- 
cgit 


From 65c5a1c0ba2cc3dc8e45a499c42191016e658b20 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 8 Sep 2001 02:59:23 +0000
Subject: convert more code to using d_printf (This used to be commit
 60d297303488ed583537ca2853828fccd6da2ade)

---
 source3/web/swat.c | 330 ++++++++++++++++++++++++++---------------------------
 1 file changed, 165 insertions(+), 165 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 5dcfe3d658..f963c16ccf 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -114,7 +114,7 @@ static int include_html(char *fname)
 	int ret;
 
 	if (!f) {
-		printf("ERROR: Can't open %s\n", fname);
+		d_printf("ERROR: Can't open %s\n", fname);
 		return 0;
 	}
 
@@ -134,13 +134,13 @@ static int include_html(char *fname)
 static void print_header(void)
 {
 	if (!cgi_waspost()) {
-		printf("Expires: 0\r\n");
+		d_printf("Expires: 0\r\n");
 	}
-	printf("Content-type: text/html\r\n\r\n");
+	d_printf("Content-type: text/html\r\n\r\n");
 
 	if (!include_html("include/header.html")) {
-		printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
-		printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"/swat/images/background.jpg\">\n\n");
+		d_printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
+		d_printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"/swat/images/background.jpg\">\n\n");
 	}
 }
 
@@ -150,7 +150,7 @@ static void print_header(void)
 static void print_footer(void)
 {
 	if (!include_html("include/footer.html")) {
-		printf("\n</BODY>\n</HTML>\n");
+		d_printf("\n</BODY>\n</HTML>\n");
 	}
 }
 
@@ -169,100 +169,100 @@ static void show_parameter(int snum, struct parm_struct *parm)
 
 	str = stripspace(parm->label);
 	strupper (str);
-	printf("<tr><td><A HREF=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\">Help</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s</td><td>", 
+	d_printf("<tr><td><A HREF=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\">Help</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s</td><td>", 
 	       str, parm->label);
 
 	switch (parm->type) {
 	case P_CHAR:
-		printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",
+		d_printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",
 		       make_parm_name(parm->label), *(char *)ptr);
-		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%c\'\">",
+		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%c\'\">",
 			make_parm_name(parm->label),(char)(parm->def.cvalue));
 		break;
 
 	case P_LIST:
-		printf("<input type=text size=40 name=\"parm_%s\" value=\"",
+		d_printf("<input type=text size=40 name=\"parm_%s\" value=\"",
 			make_parm_name(parm->label));
 		if ((char ***)ptr && *(char ***)ptr && **(char ***)ptr) {
 			char **list = *(char ***)ptr;
 			for (;*list;list++) {
-				printf("%s%s", *list, ((*(list+1))?" ":""));
+				d_printf("%s%s", *list, ((*(list+1))?" ":""));
 			}
 		}
-		printf("\">");
-		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'",
+		d_printf("\">");
+		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'",
 			make_parm_name(parm->label));
 		if (parm->def.lvalue) {
 			char **list = (char **)(parm->def.lvalue);
 			for (; *list; list++) {
-				printf("%s%s", *list, ((*(list+1))?" ":""));
+				d_printf("%s%s", *list, ((*(list+1))?" ":""));
 			}
 		}
-		printf("\'\">");
+		d_printf("\'\">");
 		break;
 
 	case P_STRING:
 	case P_USTRING:
-		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
+		d_printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
 		       make_parm_name(parm->label), *(char **)ptr);
-		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
 			make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
 		break;
 
 	case P_GSTRING:
 	case P_UGSTRING:
-		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
+		d_printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
 		       make_parm_name(parm->label), (char *)ptr);
-		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
 			make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
 		break;
 
 	case P_BOOL:
-		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
-		printf("<option %s>Yes", (*(BOOL *)ptr)?"selected":"");
-		printf("<option %s>No", (*(BOOL *)ptr)?"":"selected");
-		printf("</select>");
-		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
+		d_printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
+		d_printf("<option %s>Yes", (*(BOOL *)ptr)?"selected":"");
+		d_printf("<option %s>No", (*(BOOL *)ptr)?"":"selected");
+		d_printf("</select>");
+		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
 			make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?0:1);
 		break;
 
 	case P_BOOLREV:
-		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
-		printf("<option %s>Yes", (*(BOOL *)ptr)?"":"selected");
-		printf("<option %s>No", (*(BOOL *)ptr)?"selected":"");
-		printf("</select>");
-		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
+		d_printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
+		d_printf("<option %s>Yes", (*(BOOL *)ptr)?"":"selected");
+		d_printf("<option %s>No", (*(BOOL *)ptr)?"selected":"");
+		d_printf("</select>");
+		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
 			make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?1:0);
 		break;
 
 	case P_INTEGER:
-		printf("<input type=text size=8 name=\"parm_%s\" value=%d>", make_parm_name(parm->label), *(int *)ptr);
-		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%d\'\">",
+		d_printf("<input type=text size=8 name=\"parm_%s\" value=%d>", make_parm_name(parm->label), *(int *)ptr);
+		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%d\'\">",
 			make_parm_name(parm->label),(int)(parm->def.ivalue));
 		break;
 
 	case P_OCTAL:
-		printf("<input type=text size=8 name=\"parm_%s\" value=%s>", make_parm_name(parm->label), octal_string(*(int *)ptr));
-		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+		d_printf("<input type=text size=8 name=\"parm_%s\" value=%s>", make_parm_name(parm->label), octal_string(*(int *)ptr));
+		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
 		       make_parm_name(parm->label),
 		       octal_string((int)(parm->def.ivalue)));
 		break;
 
 	case P_ENUM:
-		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
+		d_printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
 		for (i=0;parm->enum_list[i].name;i++) {
 			if (i == 0 || parm->enum_list[i].value != parm->enum_list[i-1].value) {
-				printf("<option %s>%s",(*(int *)ptr)==parm->enum_list[i].value?"selected":"",parm->enum_list[i].name);
+				d_printf("<option %s>%s",(*(int *)ptr)==parm->enum_list[i].value?"selected":"",parm->enum_list[i].name);
 			}
 		}
-		printf("</select>");
-		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
+		d_printf("</select>");
+		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
 			make_parm_name(parm->label),enum_index((int)(parm->def.ivalue),parm->enum_list));
 		break;
 	case P_SEP:
 		break;
 	}
-	printf("</td></tr>\n");
+	d_printf("</td></tr>\n");
 }
 
 /****************************************************************************
@@ -335,7 +335,7 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 			if (printers && !(parm->flags & FLAG_PRINT)) continue;
 		}
 		if (heading && heading != last_heading) {
-			printf("<tr><td></td></tr><tr><td><b><u>%s</u></b></td></tr>\n", heading);
+			d_printf("<tr><td></td></tr><tr><td><b><u>%s</u></b></td></tr>\n", heading);
 			last_heading = heading;
 		}
 		show_parameter(snum, parm);
@@ -373,7 +373,7 @@ static int save_reload(int snum)
 
 	f = sys_fopen(servicesf,"w");
 	if (!f) {
-		printf("failed to open %s for writing\n", servicesf);
+		d_printf("failed to open %s for writing\n", servicesf);
 		return 0;
 	}
 
@@ -391,7 +391,7 @@ static int save_reload(int snum)
 	lp_killunused(NULL);
 
 	if (!load_config(False)) {
-                printf("Can't reload %s\n", servicesf);
+                d_printf("Can't reload %s\n", servicesf);
                 return 0;
         }
 	iNumNonAutoPrintServices = lp_numservices();
@@ -447,7 +447,7 @@ static void commit_parameters(int snum)
 ****************************************************************************/
 static void image_link(char *name,char *hlink, char *src)
 {
-	printf("<A HREF=\"%s/%s\"><img border=\"0\" src=\"/swat/%s\" alt=\"%s\"></A>\n", 
+	d_printf("<A HREF=\"%s/%s\"><img border=\"0\" src=\"/swat/%s\" alt=\"%s\"></A>\n", 
 	       cgi_baseurl(), hlink, src, name);
 }
 
@@ -460,7 +460,7 @@ static void show_main_buttons(void)
 	char *p;
 	
 	if ((p = cgi_user_name()) && strcmp(p, "root")) {
-		printf("Logged in as <b>%s</b><p>\n", p);
+		d_printf("Logged in as <b>%s</b><p>\n", p);
 	}
 
 	image_link("Home", "", "images/home.gif");
@@ -475,7 +475,7 @@ static void show_main_buttons(void)
 	}
 	image_link("Password Management", "passwd", "images/passwd.gif");
 
-	printf("<HR>\n");
+	d_printf("<HR>\n");
 }
 
 /****************************************************************************
@@ -497,19 +497,19 @@ static void viewconfig_page(void)
 		full_view = 1;
 	}
 
-	printf("<H2>Current Config</H2>\n");
-	printf("<form method=post>\n");
+	d_printf("<H2>Current Config</H2>\n");
+	d_printf("<form method=post>\n");
 
 	if (full_view) {
-		printf("<input type=submit name=\"normal_view\" value=\"Normal View\">\n");
+		d_printf("<input type=submit name=\"normal_view\" value=\"Normal View\">\n");
 	} else {
-		printf("<input type=submit name=\"full_view\" value=\"Full View\">\n");
+		d_printf("<input type=submit name=\"full_view\" value=\"Full View\">\n");
 	}
 
-	printf("<p><pre>");
+	d_printf("<p><pre>");
 	write_config(stdout, full_view);
-	printf("</pre>");
-	printf("</form>\n");
+	d_printf("</pre>");
+	d_printf("</form>\n");
 }
 
 /****************************************************************************
@@ -519,7 +519,7 @@ static void globals_page(void)
 {
 	int advanced = 0;
 
-	printf("<H2>Global Variables</H2>\n");
+	d_printf("<H2>Global Variables</H2>\n");
 
 	if (cgi_variable("Advanced") && !cgi_variable("Basic"))
 		advanced = 1;
@@ -529,29 +529,29 @@ static void globals_page(void)
 		save_reload(0);
 	}
 
-	printf("<FORM name=\"swatform\" method=post>\n");
+	d_printf("<FORM name=\"swatform\" method=post>\n");
 
 	if (have_write_access) {
-		printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+		d_printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
 	}
 
-	printf("<input type=reset name=\"Reset Values\" value=\"Reset Values\">\n");
+	d_printf("<input type=reset name=\"Reset Values\" value=\"Reset Values\">\n");
 	if (advanced == 0) {
-		printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
+		d_printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
 	} else {
-		printf("<input type=submit name=\"Basic\" value=\"Basic View\">\n");
+		d_printf("<input type=submit name=\"Basic\" value=\"Basic View\">\n");
 	}
-	printf("<p>\n");
+	d_printf("<p>\n");
 	
-	printf("<table>\n");
+	d_printf("<table>\n");
 	show_parameters(GLOBALS_SNUM, 1, advanced, 0);
-	printf("</table>\n");
+	d_printf("</table>\n");
 
 	if (advanced) {
-		printf("<input type=hidden name=\"Advanced\" value=1>\n");
+		d_printf("<input type=hidden name=\"Advanced\" value=1>\n");
 	}
 
-	printf("</FORM>\n");
+	d_printf("</FORM>\n");
 }
 
 /****************************************************************************
@@ -569,7 +569,7 @@ static void shares_page(void)
 	if (share)
 		snum = lp_servicenumber(share);
 
-	printf("<H2>Share Parameters</H2>\n");
+	d_printf("<H2>Share Parameters</H2>\n");
 
 	if (cgi_variable("Advanced") && !cgi_variable("Basic"))
 		advanced = 1;
@@ -594,62 +594,62 @@ static void shares_page(void)
 		snum = lp_servicenumber(share);
 	}
 
-	printf("<FORM name=\"swatform\" method=post>\n");
+	d_printf("<FORM name=\"swatform\" method=post>\n");
 
-	printf("<table>\n");
-	printf("<tr>\n");
-	printf("<td><input type=submit name=selectshare value=\"Choose Share\"></td>\n");
-	printf("<td><select name=share>\n");
+	d_printf("<table>\n");
+	d_printf("<tr>\n");
+	d_printf("<td><input type=submit name=selectshare value=\"Choose Share\"></td>\n");
+	d_printf("<td><select name=share>\n");
 	if (snum < 0)
-		printf("<option value=\" \"> \n");
+		d_printf("<option value=\" \"> \n");
 	for (i=0;i<lp_numservices();i++) {
 		s = lp_servicename(i);
 		if (s && (*s) && strcmp(s,"IPC$") && !lp_print_ok(i)) {
-			printf("<option %s value=\"%s\">%s\n", 
+			d_printf("<option %s value=\"%s\">%s\n", 
 			       (share && strcmp(share,s)==0)?"SELECTED":"",
 			       s, s);
 		}
 	}
-	printf("</select></td>\n");
+	d_printf("</select></td>\n");
 	if (have_write_access) {
-		printf("<td><input type=submit name=\"Delete\" value=\"Delete Share\"></td>\n");
+		d_printf("<td><input type=submit name=\"Delete\" value=\"Delete Share\"></td>\n");
 	}
-	printf("</tr>\n");
-	printf("</table>");
-	printf("<table>");
+	d_printf("</tr>\n");
+	d_printf("</table>");
+	d_printf("<table>");
 	if (have_write_access) {
-		printf("<tr>\n");
-		printf("<td><input type=submit name=createshare value=\"Create Share\"></td>\n");
-		printf("<td><input type=text size=30 name=newshare></td></tr>\n");
+		d_printf("<tr>\n");
+		d_printf("<td><input type=submit name=createshare value=\"Create Share\"></td>\n");
+		d_printf("<td><input type=text size=30 name=newshare></td></tr>\n");
 	}
-	printf("</table>");
+	d_printf("</table>");
 
 
 	if (snum >= 0) {
 		if (have_write_access) {
-			printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+			d_printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
 		}
 
-		printf("<input type=reset name=\"Reset Values\" value=\"Reset Values\">\n");
+		d_printf("<input type=reset name=\"Reset Values\" value=\"Reset Values\">\n");
 		if (advanced == 0) {
-			printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
+			d_printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
 		} else {
-			printf("<input type=submit name=\"Basic\" value=\"Basic View\">\n");
+			d_printf("<input type=submit name=\"Basic\" value=\"Basic View\">\n");
 		}
-		printf("<p>\n");
+		d_printf("<p>\n");
 	}
 
 	if (snum >= 0) {
-		printf("<table>\n");
+		d_printf("<table>\n");
 		show_parameters(snum, 1, advanced, 0);
-		printf("</table>\n");
+		d_printf("</table>\n");
 	}
 
 	if (advanced) {
-		printf("<input type=hidden name=\"Advanced\" value=1>\n");
+		d_printf("<input type=hidden name=\"Advanced\" value=1>\n");
 	}
 
-	printf("</FORM>\n");
+	d_printf("</FORM>\n");
 }
 
 /*************************************************************
@@ -664,7 +664,7 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 	pstring msg_str;
 
 	if (demo_mode) {
-		printf("password change in demo mode rejected\n<p>");
+		d_printf("password change in demo mode rejected\n<p>");
 		return False;
 	}
 	
@@ -672,12 +672,12 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 		ret = remote_password_change(remote_machine, user_name, old_passwd, 
 									 new_passwd, err_str, sizeof(err_str));
 		if(*err_str)
-			printf("%s\n<p>", err_str);
+			d_printf("%s\n<p>", err_str);
 		return ret;
 	}
 
 	if(!initialize_password_db(True)) {
-		printf("Can't setup password database vectors.\n<p>");
+		d_printf("Can't setup password database vectors.\n<p>");
 		return False;
 	}
 	
@@ -685,9 +685,9 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 					 msg_str, sizeof(msg_str));
 
 	if(*msg_str)
-		printf("%s\n<p>", msg_str);
+		d_printf("%s\n<p>", msg_str);
 	if(*err_str)
-		printf("%s\n<p>", err_str);
+		d_printf("%s\n<p>", err_str);
 
 	return ret;
 }
@@ -703,7 +703,7 @@ static void chg_passwd(void)
 
 	/* Make sure users name has been specified */
 	if (strlen(cgi_variable(SWAT_USER)) == 0) {
-		printf("<p> Must specify \"User Name\" \n");
+		d_printf("<p> Must specify \"User Name\" \n");
 		return;
 	}
 
@@ -719,26 +719,26 @@ static void chg_passwd(void)
 		 */
 		if (((!am_root()) && (strlen( cgi_variable(OLD_PSWD)) <= 0)) ||
 		    ((cgi_variable(CHG_R_PASSWD_FLAG)) &&  (strlen( cgi_variable(OLD_PSWD)) <= 0))) {
-			printf("<p> Must specify \"Old Password\" \n");
+			d_printf("<p> Must specify \"Old Password\" \n");
 			return;
 		}
 
 		/* If changing a users password on a remote hosts we have to know what host */
 		if ((cgi_variable(CHG_R_PASSWD_FLAG)) && (strlen( cgi_variable(RHOST)) <= 0)) {
-			printf("<p> Must specify \"Remote Machine\" \n");
+			d_printf("<p> Must specify \"Remote Machine\" \n");
 			return;
 		}
 
 		/* Make sure new passwords have been specified */
 		if ((strlen( cgi_variable(NEW_PSWD)) <= 0) ||
 		    (strlen( cgi_variable(NEW2_PSWD)) <= 0)) {
-			printf("<p> Must specify \"New, and Re-typed Passwords\" \n");
+			d_printf("<p> Must specify \"New, and Re-typed Passwords\" \n");
 			return;
 		}
 
 		/* Make sure new passwords was typed correctly twice */
 		if (strcmp(cgi_variable(NEW_PSWD), cgi_variable(NEW2_PSWD)) != 0) {
-			printf("<p> Re-typed password didn't match new password\n");
+			d_printf("<p> Re-typed password didn't match new password\n");
 			return;
 		}
 	}
@@ -767,9 +767,9 @@ static void chg_passwd(void)
 
 	if(local_flags == 0) {
 		if (rslt == True) {
-			printf("<p> The passwd for '%s' has been changed. \n", cgi_variable(SWAT_USER));
+			d_printf("<p> The passwd for '%s' has been changed. \n", cgi_variable(SWAT_USER));
 		} else {
-			printf("<p> The passwd for '%s' has NOT been changed. \n",cgi_variable(SWAT_USER));
+			d_printf("<p> The passwd for '%s' has NOT been changed. \n",cgi_variable(SWAT_USER));
 		}
 	}
 	
@@ -793,43 +793,43 @@ static void passwd_page(void)
 
 	if (!new_name) new_name = "";
 
-	printf("<H2>Server Password Management</H2>\n");
+	d_printf("<H2>Server Password Management</H2>\n");
 
-	printf("<FORM name=\"swatform\" method=post>\n");
+	d_printf("<FORM name=\"swatform\" method=post>\n");
 
-	printf("<table>\n");
+	d_printf("<table>\n");
 
 	/* 
 	 * Create all the dialog boxes for data collection
 	 */
-	printf("<tr><td> User Name : </td>\n");
-	printf("<td><input type=text size=30 name=%s value=%s></td></tr> \n", SWAT_USER, new_name);
+	d_printf("<tr><td> User Name : </td>\n");
+	d_printf("<td><input type=text size=30 name=%s value=%s></td></tr> \n", SWAT_USER, new_name);
 	if (!am_root()) {
-		printf("<tr><td> Old Password : </td>\n");
-		printf("<td><input type=password size=30 name=%s></td></tr> \n",OLD_PSWD);
+		d_printf("<tr><td> Old Password : </td>\n");
+		d_printf("<td><input type=password size=30 name=%s></td></tr> \n",OLD_PSWD);
 	}
-	printf("<tr><td> New Password : </td>\n");
-	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
-	printf("<tr><td> Re-type New Password : </td>\n");
-	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
-	printf("</table>\n");
+	d_printf("<tr><td> New Password : </td>\n");
+	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
+	d_printf("<tr><td> Re-type New Password : </td>\n");
+	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
+	d_printf("</table>\n");
 
 	/*
 	 * Create all the control buttons for requesting action
 	 */
-	printf("<input type=submit name=%s value=\"Change Password\">\n", 
+	d_printf("<input type=submit name=%s value=\"Change Password\">\n", 
 	       CHG_S_PASSWD_FLAG);
 	if (demo_mode || am_root()) {
-		printf("<input type=submit name=%s value=\"Add New User\">\n",
+		d_printf("<input type=submit name=%s value=\"Add New User\">\n",
 		       ADD_USER_FLAG);
-		printf("<input type=submit name=%s value=\"Delete User\">\n",
+		d_printf("<input type=submit name=%s value=\"Delete User\">\n",
 		       DELETE_USER_FLAG);
-		printf("<input type=submit name=%s value=\"Disable User\">\n", 
+		d_printf("<input type=submit name=%s value=\"Disable User\">\n", 
 		       DISABLE_USER_FLAG);
-		printf("<input type=submit name=%s value=\"Enable User\">\n", 
+		d_printf("<input type=submit name=%s value=\"Enable User\">\n", 
 		       ENABLE_USER_FLAG);
 	}
-	printf("<p></FORM>\n");
+	d_printf("<p></FORM>\n");
 
 	/*
 	 * Do some work if change, add, disable or enable was
@@ -840,35 +840,35 @@ static void passwd_page(void)
 		chg_passwd();		
 	}
 
-	printf("<H2>Client/Server Password Management</H2>\n");
+	d_printf("<H2>Client/Server Password Management</H2>\n");
 
-	printf("<FORM name=\"swatform\" method=post>\n");
+	d_printf("<FORM name=\"swatform\" method=post>\n");
 
-	printf("<table>\n");
+	d_printf("<table>\n");
 
 	/* 
 	 * Create all the dialog boxes for data collection
 	 */
-	printf("<tr><td> User Name : </td>\n");
-	printf("<td><input type=text size=30 name=%s value=%s></td></tr>\n",SWAT_USER, new_name);
-	printf("<tr><td> Old Password : </td>\n");
-	printf("<td><input type=password size=30 name=%s></td></tr>\n",OLD_PSWD);
-	printf("<tr><td> New Password : </td>\n");
-	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
-	printf("<tr><td> Re-type New Password : </td>\n");
-	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
-	printf("<tr><td> Remote Machine : </td>\n");
-	printf("<td><input type=text size=30 name=%s></td></tr>\n",RHOST);
-
-	printf("</table>");
+	d_printf("<tr><td> User Name : </td>\n");
+	d_printf("<td><input type=text size=30 name=%s value=%s></td></tr>\n",SWAT_USER, new_name);
+	d_printf("<tr><td> Old Password : </td>\n");
+	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",OLD_PSWD);
+	d_printf("<tr><td> New Password : </td>\n");
+	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
+	d_printf("<tr><td> Re-type New Password : </td>\n");
+	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
+	d_printf("<tr><td> Remote Machine : </td>\n");
+	d_printf("<td><input type=text size=30 name=%s></td></tr>\n",RHOST);
+
+	d_printf("</table>");
 
 	/*
 	 * Create all the control buttons for requesting action
 	 */
-	printf("<input type=submit name=%s value=\"Change Password\">", 
+	d_printf("<input type=submit name=%s value=\"Change Password\">", 
 	       CHG_R_PASSWD_FLAG);
 
-	printf("<p></FORM>\n");
+	d_printf("<p></FORM>\n");
 
 	/*
 	 * Do some work if a request has been made to change the
@@ -895,13 +895,13 @@ static void printers_page(void)
 	if (share)
 		snum = lp_servicenumber(share);
 
-	printf("<H2>Printer Parameters</H2>\n");
+	d_printf("<H2>Printer Parameters</H2>\n");
 
-	printf("<H3>Important Note:</H3>\n");
-	printf("Printer names marked with [*] in the Choose Printer drop-down box ");
-	printf("are autoloaded printers from ");
-	printf("<A HREF=\"/swat/help/smb.conf.5.html#PRINTCAPNAME\" target=\"docs\">Printcap Name</A>.\n");
-	printf("Attempting to delete these printers from SWAT will have no effect.\n");
+	d_printf("<H3>Important Note:</H3>\n");
+	d_printf("Printer names marked with [*] in the Choose Printer drop-down box ");
+	d_printf("are autoloaded printers from ");
+	d_printf("<A HREF=\"/swat/help/smb.conf.5.html#PRINTCAPNAME\" target=\"docs\">Printcap Name</A>.\n");
+	d_printf("Attempting to delete these printers from SWAT will have no effect.\n");
 
 	if (cgi_variable("Advanced") && !cgi_variable("Basic"))
 		advanced = 1;
@@ -931,65 +931,65 @@ static void printers_page(void)
 		snum = lp_servicenumber(share);
 	}
 
-	printf("<FORM name=\"swatform\" method=post>\n");
+	d_printf("<FORM name=\"swatform\" method=post>\n");
 
-	printf("<table>\n");
-	printf("<tr><td><input type=submit name=selectshare value=\"Choose Printer\"></td>\n");
-	printf("<td><select name=share>\n");
+	d_printf("<table>\n");
+	d_printf("<tr><td><input type=submit name=selectshare value=\"Choose Printer\"></td>\n");
+	d_printf("<td><select name=share>\n");
 	if (snum < 0 || !lp_print_ok(snum))
-		printf("<option value=\" \"> \n");
+		d_printf("<option value=\" \"> \n");
 	for (i=0;i<lp_numservices();i++) {
 		s = lp_servicename(i);
 		if (s && (*s) && strcmp(s,"IPC$") && lp_print_ok(i)) {
                     if (i >= iNumNonAutoPrintServices)
-                        printf("<option %s value=\"%s\">[*]%s\n",
+                        d_printf("<option %s value=\"%s\">[*]%s\n",
                                (share && strcmp(share,s)==0)?"SELECTED":"",
                                s, s);
                     else
-			printf("<option %s value=\"%s\">%s\n", 
+			d_printf("<option %s value=\"%s\">%s\n", 
 			       (share && strcmp(share,s)==0)?"SELECTED":"",
 			       s, s);
 		}
 	}
-	printf("</select></td>");
+	d_printf("</select></td>");
 	if (have_write_access) {
-		printf("<td><input type=submit name=\"Delete\" value=\"Delete Printer\"></td>\n");
+		d_printf("<td><input type=submit name=\"Delete\" value=\"Delete Printer\"></td>\n");
 	}
-	printf("</tr>");
-	printf("</table>\n");
+	d_printf("</tr>");
+	d_printf("</table>\n");
 
 	if (have_write_access) {
-		printf("<table>\n");
-		printf("<tr><td><input type=submit name=createshare value=\"Create Printer\"></td>\n");
-		printf("<td><input type=text size=30 name=newshare></td></tr>\n");
-		printf("</table>");
+		d_printf("<table>\n");
+		d_printf("<tr><td><input type=submit name=createshare value=\"Create Printer\"></td>\n");
+		d_printf("<td><input type=text size=30 name=newshare></td></tr>\n");
+		d_printf("</table>");
 	}
 
 
 	if (snum >= 0) {
 		if (have_write_access) {
-			printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+			d_printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
 		}
-		printf("<input type=reset name=\"Reset Values\" value=\"Reset Values\">\n");
+		d_printf("<input type=reset name=\"Reset Values\" value=\"Reset Values\">\n");
 		if (advanced == 0) {
-			printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
+			d_printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
 		} else {
-			printf("<input type=submit name=\"Basic\" value=\"Basic View\">\n");
+			d_printf("<input type=submit name=\"Basic\" value=\"Basic View\">\n");
 		}
-		printf("<p>\n");
+		d_printf("<p>\n");
 	}
 
 	if (snum >= 0) {
-		printf("<table>\n");
+		d_printf("<table>\n");
 		show_parameters(snum, 1, advanced, 1);
-		printf("</table>\n");
+		d_printf("</table>\n");
 	}
 
 	if (advanced) {
-		printf("<input type=hidden name=\"Advanced\" value=1>\n");
+		d_printf("<input type=hidden name=\"Advanced\" value=1>\n");
 	}
 
-	printf("</FORM>\n");
+	d_printf("</FORM>\n");
 }
 
 /****************************************************************************
-- 
cgit 


From b30e75692d68233448b3ad3d7ddd4b4ac423d3ab Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 10 Sep 2001 11:08:57 +0000
Subject: replaced stdio in many parts of samba with a XFILE. XFILE is a
 cut-down replacemnt of stdio that doesn't suffer from the 8-bit
 filedescriptor limit that we hit with nasty consequences on some systems

I would eventually prefer us to have a configure test to see if we need
to replace stdio, but for now this code needs to be tested widely so
I'm enabling it by default.
(This used to be commit 1af8bf34f1caa3e7ec312d8109c07d32a945a448)
---
 source3/web/cgi.c  | 6 +++---
 source3/web/swat.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 651cd3d8c3..88f4d3f36f 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -149,9 +149,9 @@ void cgi_load_variables(FILE *f1)
 			len = content_length;
 		}
 	} else {
-		fseek(f, 0, SEEK_END);
-		len = ftell(f);
-		fseek(f, 0, SEEK_SET);
+		struct stat st;
+		fstat(fileno(f), &st);
+		len = st.st_size;
 	}
 
 
diff --git a/source3/web/swat.c b/source3/web/swat.c
index f963c16ccf..8551c5e907 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -999,7 +999,7 @@ static void printers_page(void)
 {
 	extern char *optarg;
 	extern int optind;
-	extern FILE *dbf;
+	extern XFILE *dbf;
 	int opt;
 	char *page;
 
@@ -1016,8 +1016,8 @@ static void printers_page(void)
 	/* we don't want any SIGPIPE messages */
 	BlockSignals(True,SIGPIPE);
 
-	dbf = sys_fopen("/dev/null", "w");
-	if (!dbf) dbf = stderr;
+	dbf = x_fopen("/dev/null", O_WRONLY, 0);
+	if (!dbf) dbf = x_stderr;
 
 	/* we don't want stderr screwing us up */
 	close(2);
-- 
cgit 


From b12a4dd9b655485420d5c67dd143d8f49ac28a40 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 10 Sep 2001 12:14:18 +0000
Subject: declare dbf in one spot (This used to be commit
 f41c3bb80f1e498a9d27f6e236b0ff3a742764c9)

---
 source3/web/swat.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 8551c5e907..56ce321f8d 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -999,7 +999,6 @@ static void printers_page(void)
 {
 	extern char *optarg;
 	extern int optind;
-	extern XFILE *dbf;
 	int opt;
 	char *page;
 
-- 
cgit 


From c0ef0e113e8d3117891b4b137f660ca3c4c6b1f0 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Mon, 17 Sep 2001 11:48:29 +0000
Subject: move to SAFE_FREE() (This used to be commit
 67db8f03c5c9e81e11b5f3276b50ee23e09a2659)

---
 source3/web/cgi.c      | 2 +-
 source3/web/diagnose.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 88f4d3f36f..3547379084 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -168,7 +168,7 @@ void cgi_load_variables(FILE *f1)
 			variables[num_variables].name = strdup(line);
 			variables[num_variables].value = strdup(p+1);
 
-			free(line);
+			SAFE_FREE(line);
 			
 			if (!variables[num_variables].name || 
 			    !variables[num_variables].value)
diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index f22fe0d9b2..bf2e6da17d 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -36,7 +36,7 @@ BOOL nmbd_running(void)
 		if ((ip_list = name_query(fd, "__SAMBA__", 0, 
 					  True, True, loopback_ip,
 					  &count)) != NULL) {
-			free(ip_list);
+			SAFE_FREE(ip_list);
 			close(fd);
 			return True;
 		}
-- 
cgit 


From 6adafe50d4a9a75a6fe1f666232e0af1ac717513 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 19 Sep 2001 05:26:11 +0000
Subject: Remove the ugly hacks to get around the Get_Pwnam() calls in
 pass_check.c by simply not doing Get_Pwnam() calls in pass_check.c

We now make *one* sys_getpnam() call in cgi.c and we always call PAM no matter
what it returns.  We also no longer run the password cracker for these logins.

The truly parinod will note the slight difference in call paths, in that we only
call crypt for valid password structs (if not --with-pam).  The truly parinoid
don't run SWAT either, so I don't think this is an issue.

Andrew Bartlett
(This used to be commit 9020d884935243f28c19cedc88f076f0709e12cb)
---
 source3/web/cgi.c | 71 +++++++++++++++++++------------------------------------
 1 file changed, 24 insertions(+), 47 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 3547379084..b4356af46e 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -362,14 +362,6 @@ static BOOL cgi_handle_authorization(char *line)
 {
 	char *p, *user, *user_pass;
 	struct passwd *pass = NULL;
-	BOOL got_name = False;
-	BOOL tested_pass = False;
-	fstring default_user_lookup;
-	fstring default_user_pass;
-
-	/* Dummy user lookup to take the same time as a valid user. */
-	fstrcpy(default_user_lookup, "zzzz bibble");
-	fstrcpy(default_user_pass, "123456789");
 
 	if (strncasecmp(line,"Basic ", 6)) {
 		goto err;
@@ -387,55 +379,40 @@ static BOOL cgi_handle_authorization(char *line)
 	*p = 0;
 	user = line;
 	user_pass = p+1;
-
+	
 	/*
 	 * Try and get the user from the UNIX password file.
 	 */
-
-	if(!(pass = Get_Pwnam(user,False))) {
-		/*
-		 * Always give the same error so a cracker
-		 * cannot tell why we fail.
-		 */
-		got_name = True;
-		goto err;
-	}
-
+	
+	pass = sys_getpwnam(user);
+	
 	/*
 	 * Validate the password they have given.
 	 */
-
-	tested_pass = True;
-
-	if(pass_check(user, user_pass, strlen(user_pass), NULL) == True) {
-
-		/*
-		 * Password was ok.
-		 */
-
-		if(pass->pw_uid != 0) {
+	
+	if (pass_check(pass, user, user_pass, 
+		      strlen(user_pass), NULL, False)) {
+		
+		if (pass) {
 			/*
-			 * We have not authenticated as root,
-			 * become the user *permanently*.
+			 * Password was ok.
 			 */
-			become_user_permanently(pass->pw_uid, pass->pw_gid);
+			
+			if(pass->pw_uid != 0) {
+				/*
+				 * We have not authenticated as root,
+				 * become the user *permanently*.
+				 */
+				become_user_permanently(pass->pw_uid, pass->pw_gid);
+			}
+			
+			/* Save the users name */
+			C_user = strdup(user);
+			return True;
 		}
-
-		/* Save the users name */
-		C_user = strdup(user);
-		return True;
 	}
-
-  err:
-
-	/* Always take the same time. */
-	if (!got_name)
-		Get_Pwnam(default_user_lookup,False);
-
-	if (!tested_pass)
-		pass_check(default_user_lookup, default_user_pass,
-					strlen(default_user_pass), NULL);
-
+	
+err:
 	cgi_setup_error("401 Bad Authorization", "", 
 			"username or password incorrect");
 
-- 
cgit 


From fa6713bf8b121a45e59235786eec3cee29e92e67 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 20 Sep 2001 13:15:35 +0000
Subject: Move pass_check.c over to NTSTATUS, allowing full NTSTATUS from PAM
 to wire!

Add the ability for swat to run in non-root-mode (ie non-root from inetd).
 - we still need some of the am_root() calls fixed however.
(This used to be commit 2c2317c56ee13abdbdbc866363c3b52dab826e3c)
---
 source3/web/cgi.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index b4356af46e..a8af9b2722 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -390,7 +390,7 @@ static BOOL cgi_handle_authorization(char *line)
 	 * Validate the password they have given.
 	 */
 	
-	if (pass_check(pass, user, user_pass, 
+	if NT_STATUS_IS_OK(pass_check(pass, user, user_pass, 
 		      strlen(user_pass), NULL, False)) {
 		
 		if (pass) {
@@ -398,13 +398,7 @@ static BOOL cgi_handle_authorization(char *line)
 			 * Password was ok.
 			 */
 			
-			if(pass->pw_uid != 0) {
-				/*
-				 * We have not authenticated as root,
-				 * become the user *permanently*.
-				 */
-				become_user_permanently(pass->pw_uid, pass->pw_gid);
-			}
+			become_user_permanently(pass->pw_uid, pass->pw_gid);
 			
 			/* Save the users name */
 			C_user = strdup(user);
@@ -508,6 +502,9 @@ void cgi_setup(char *rootdir, int auth_required)
 				"chdir failed - the server is not configured correctly");
 	}
 
+	/* Handle the possability we might be running as non-root */
+	sec_init();
+
 	/* maybe we are running under a web server */
 	if (getenv("CONTENT_LENGTH") || getenv("REQUEST_METHOD")) {
 		if (auth_required) {
-- 
cgit 


From 1fcc9e1f6d2a6ee3f170055692cbfbe7432cf7ee Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 24 Sep 2001 04:49:14 +0000
Subject: convert all POST variables from display to unix charset (This used to
 be commit cd6478ad9890949d0ef34a7078ec5518debe4a3c)

---
 source3/web/cgi.c  | 50 ++++++++++++++++++++++++++++----------------------
 source3/web/swat.c |  2 +-
 2 files changed, 29 insertions(+), 23 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index a8af9b2722..0227cd07a6 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -127,12 +127,12 @@ static char *grab_line(FILE *f, int *cl)
   with the same name and the same or different values. Takes a file parameter
   for simulating CGI invocation eg loading saved preferences.
   ***************************************************************************/
-void cgi_load_variables(FILE *f1)
+void cgi_load_variables(void)
 {
-	FILE *f = f1;
 	static char *line;
 	char *p, *s, *tok;
-	int len;
+	int len, i;
+	FILE *f = stdin;
 
 #ifdef DEBUG_COMMENTS
 	char dummy[100]="";
@@ -140,23 +140,16 @@ void cgi_load_variables(FILE *f1)
 	printf("<!== Start dump in cgi_load_variables() %s ==>\n",__FILE__);
 #endif
 
-	if (!f1) {
-		f = stdin;
-		if (!content_length) {
-			p = getenv("CONTENT_LENGTH");
-			len = p?atoi(p):0;
-		} else {
-			len = content_length;
-		}
+	if (!content_length) {
+		p = getenv("CONTENT_LENGTH");
+		len = p?atoi(p):0;
 	} else {
-		struct stat st;
-		fstat(fileno(f), &st);
-		len = st.st_size;
+		len = content_length;
 	}
 
 
 	if (len > 0 && 
-	    (f1 || request_post ||
+	    (request_post ||
 	     ((s=getenv("REQUEST_METHOD")) && 
 	      strcasecmp(s,"POST")==0))) {
 		while (len && (line=grab_line(f, &len))) {
@@ -188,13 +181,6 @@ void cgi_load_variables(FILE *f1)
 		}
 	}
 
-	if (f1) {
-#ifdef DEBUG_COMMENTS
-	        printf("<!== End dump in cgi_load_variables() ==>\n"); 
-#endif
-		return;
-	}
-
 	fclose(stdin);
 	open("/dev/null", O_RDWR);
 
@@ -228,6 +214,26 @@ void cgi_load_variables(FILE *f1)
 #ifdef DEBUG_COMMENTS
         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 */
+	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);
+	}
+
+
 }
 
 
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 56ce321f8d..9a7658e94f 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1042,7 +1042,7 @@ static void printers_page(void)
 
 	print_header();
 	
-	cgi_load_variables(NULL);
+	cgi_load_variables();
 
 	if (!file_exist(servicesf, NULL)) {
 		have_read_access = True;
-- 
cgit 


From 1c29d9d8f060f5967fdff1ba04dfd982e5da61bb Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 24 Sep 2001 06:02:31 +0000
Subject: fixed bug in POST var handling (This used to be commit
 73f10d3ef6de2dbcb23f93ef93eb9e7053ebf26b)

---
 source3/web/cgi.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 0227cd07a6..7b12bf5748 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -221,19 +221,17 @@ void cgi_load_variables(void)
 		pstring dest;
 
 		convert_string(CH_DISPLAY, CH_UNIX, 
-			       variables[i].name, -1, 
+			       variables[i].name, strlen(variables[i].name), 
 			       dest, sizeof(dest));
 		free(variables[i].name);
 		variables[i].name = strdup(dest);
 
 		convert_string(CH_DISPLAY, CH_UNIX, 
-			       variables[i].value, -1, 
+			       variables[i].value, strlen(variables[i].name), 
 			       dest, sizeof(dest));
 		free(variables[i].value);
 		variables[i].value = strdup(dest);
 	}
-
-
 }
 
 
-- 
cgit 


From 79b5b1aebf9f59e4de19c9b52f473cfd06d1fd0c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 24 Sep 2001 06:24:14 +0000
Subject: fixed a silly off by 1 bug (This used to be commit
 e558ab6ac8930e3393291fe12289ad43175b8a1d)

---
 source3/web/cgi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 7b12bf5748..939b8f94cd 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -221,13 +221,13 @@ void cgi_load_variables(void)
 		pstring dest;
 
 		convert_string(CH_DISPLAY, CH_UNIX, 
-			       variables[i].name, strlen(variables[i].name), 
+			       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, strlen(variables[i].name), 
+			       variables[i].value, -1,
 			       dest, sizeof(dest));
 		free(variables[i].value);
 		variables[i].value = strdup(dest);
-- 
cgit 


From 96db4b1ba3a48f50b80b2cfbf0b940e073b7843c Mon Sep 17 00:00:00 2001
From: Motonobu Takahashi <monyo@samba.org>
Date: Mon, 24 Sep 2001 15:55:09 +0000
Subject: Added SWAT i18n feature:   TO enable configure with --with-i18n-swat 
  to support this gettext is integrated   and a new directories name "po" and
 "intl" are created.

  now these languages are supported:

  en - English (default)
  ja - Japanese
  po - Polish
  tr - Turkish

  To add your language,
  to create ${your_language}.po by translating source/po/en.po
  into your language is needed.

  some of html and image files of various language version are not
  included yet, though message catalogue files are installed.
  you need to copy files manually under
  ${swatdir}/lang/$ln/{help,images,included,using_samba}


And also added a option to intall manual pages:
of various lang version
  To enable configure with --with-manlangs
  but manual pages themself are not included yet.
(This used to be commit 486b79a6fc4ba20a751aab544bd0f7ccff2b3d19)
---
 source3/web/cgi.c        |  20 ++-
 source3/web/neg_lang.c   | 378 +++++++++++++++++++++++++++++++++++++++++++++++
 source3/web/statuspage.c |  72 ++++-----
 source3/web/swat.c       | 235 +++++++++++++++++------------
 4 files changed, 571 insertions(+), 134 deletions(-)
 create mode 100644 source3/web/neg_lang.c

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 939b8f94cd..d2b30c49e9 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "smb.h"
+#include "webintl.h"
 
 #define MAX_VARIABLES 10000
 
@@ -447,6 +448,7 @@ static void cgi_download(char *file)
 	char buf[1024];
 	int fd, l, i;
 	char *p;
+	int nLangDesc;
 
 	/* sanitise the filename */
 	for (i=0;file[i];i++) {
@@ -460,7 +462,11 @@ static void cgi_download(char *file)
 		cgi_setup_error("404 File Not Found","",
 				"The requested file was not found");
 	}
+#if I18N_SWAT
+	fd = sys_open(ln_get_pref_file(file, &st, &nLangDesc),O_RDONLY,0);
+#else
 	fd = sys_open(file,O_RDONLY,0);
+#endif 
 	if (fd == -1) {
 		cgi_setup_error("404 File Not Found","",
 				"The requested file was not found");
@@ -478,7 +484,10 @@ static void cgi_download(char *file)
 		}
 	}
 	printf("Expires: %s\r\n", http_timestring(time(NULL)+EXPIRY_TIME));
-
+#if I18N_SWAT
+	if(ln_get_lang(nLangDesc))
+		printf("Content-Language: %s\r\n", ln_get_lang(nLangDesc));
+#endif
 	printf("Content-Length: %d\r\n\r\n", (int)st.st_size);
 	while ((l=read(fd,buf,sizeof(buf)))>0) {
 		fwrite(buf, 1, l, stdout);
@@ -509,6 +518,11 @@ void cgi_setup(char *rootdir, int auth_required)
 	/* Handle the possability we might be running as non-root */
 	sec_init();
 
+#if I18N_SWAT
+	if(getenv("HTTP_ACCEPT_LANGUAGE")) /* if running as a cgi program */
+		ln_negotiate_language(getenv("HTTP_ACCEPT_LANGUAGE"));
+#endif
+
 	/* maybe we are running under a web server */
 	if (getenv("CONTENT_LENGTH") || getenv("REQUEST_METHOD")) {
 		if (auth_required) {
@@ -543,6 +557,10 @@ void cgi_setup(char *rootdir, int auth_required)
 			authenticated = cgi_handle_authorization(&line[15]);
 		} else if (strncasecmp(line,"Content-Length: ", 16)==0) {
 			content_length = atoi(&line[16]);
+#if I18N_SWAT
+		} else if (strncasecmp(line,"Accept-Language: ", 17)==0) {
+			ln_negotiate_language(&line[17]);
+#endif
 		}
 		/* ignore all other requests! */
 	}
diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
new file mode 100644
index 0000000000..8cb41a34ec
--- /dev/null
+++ b/source3/web/neg_lang.c
@@ -0,0 +1,378 @@
+/*
+   Unix SMB/Netbios implementation.
+   Version 1.9.
+   Samba Web Administration Tool
+   
+   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
+   (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.
+
+   Created by Ryo Kawahara <rkawa@lbe.co.jp> 
+*/
+
+#include "includes.h"
+/* #include "config.h" */
+#include "webintl.h"
+
+#if I18N_SWAT
+/* constants. */
+/* it is ok to make them bigger.*/
+#define LN_PREFLANG_MAX 10
+#define LN_LNAME_LENGTH 8+1+8
+
+#define LN_DEFAULT_LANG I18N_DEFAULT_LANG
+#define LN_LANGDESC_DEFAULT -1
+#define LN_NO_AVAILABLE_LANG -1
+
+/* ******************************************************************
+ * macros for debugging.
+ ***************************************************************** */
+#ifdef LN_R_NODEBUG
+
+#else
+/*
+ *#define LN_DEBUG_LOG "/tmp/lndebug.log"
+ *void ln_debug_error(const char *info, int nLine)
+ *{
+ *	FILE* fp;
+ *	fp = sys_fopen(LN_DEBUG_LOG, "a");
+ *	fprintf(fp, "%s at %d.\n", info, nLine);
+ *	fclose(fp);
+ *}
+ *void rassert_help(BOOL b, int l)
+ *{
+ *	if(!b)
+ *	{
+ *		ln_debug_error("language negotiation error.", l);
+ *		exit(1);
+ *	}
+ *}
+ */
+#endif /* LN_R_NODEBUG */
+
+/* ****************************************************************
+ LNNegotiator struct. It contains...
+ [aPrefLang]
+  the array of strings. each string is the name of
+  languages ("ja", "ko"...), given by web browser.
+ [nPrefLang]
+  the number of the languages in aPrefLang.
+ [lOriginalLang]
+  == "en": indicates what language the  default(original) files
+  are written with.
+**************************************************************** */
+typedef char lnstring[LN_LNAME_LENGTH + 1];
+#define lnstrcpy(d,s) safe_strcpy((d),(s),sizeof(lnstring)-1)
+
+typedef struct tagLNNegotiator
+{
+	lnstring aPrefLang[LN_PREFLANG_MAX];
+	int nPrefLang;
+	lnstring lOriginalLang;
+}LNNegotiator;
+
+/* **************************************************************
+ * some access functions & macros for LNNegotiator struct.
+ * ************************************************************ */
+#define ln_getPreflangCount(pLn) ((pLn)->nPrefLang)
+#define ln_getOriginalLang(pLn) ((pLn)->lOriginalLang)
+#define ln_getDefaultPrefLang(pLn) ((pLn)->lDefaultPrefLang)
+
+/* make it inline-expanded (or macro) to get better performance */
+static const char* ln_getPreflang(LNNegotiator* pLn, int i)
+{
+	rassert(i == LN_LANGDESC_DEFAULT
+	       || (0 <= i && i < ln_getPreflangCount(pLn)));
+
+	if(i == LN_LANGDESC_DEFAULT)
+		return NULL;
+	if(0 <= i && i < ln_getPreflangCount(pLn))
+		return pLn->aPrefLang[i];
+	return NULL;
+}
+/* initialize structures */
+static void ln_resetln(LNNegotiator* pLn)
+{
+	pLn->nPrefLang = 0;
+	/* using fixed memory.*/
+}
+static BOOL ln_addPreflang(LNNegotiator* pLn, const char* pLang)
+{
+	int nPref = ln_getPreflangCount(pLn);
+
+	if(nPref >= LN_PREFLANG_MAX)
+		return False;
+
+	lnstrcpy(pLn->aPrefLang[nPref], pLang);
+	(pLn->nPrefLang)++;
+	return True;
+}
+static void ln_initln_help(LNNegotiator* pLn)
+{
+	ln_resetln(pLn);
+	lnstrcpy(pLn->lOriginalLang, I18N_ORIGINAL_LANG);
+	/* I18N_ORIGINAL_LANG = "en" is hardcoded in
+	   webintl.h. */
+	if (I18N_DEFAULT_PREF_LANG[0] != '\0')
+	      ln_addPreflang(pLn, I18N_DEFAULT_PREF_LANG);
+
+	/* this entry is used only when web browser didn't send
+	   ACCEPT-LANGUAGE header. */
+}
+/* ****************************************************************
+ * store acceptable languages into LNNegotiator object.
+ * [pstrLangarray] The arguments of "accept-language" http header, 
+ * which is like "en-GB, es;q=0.5, ja". "q=0.5" is called quality value,
+ * but it is ignored now. wiled card "*" is also ignored. 
+ ***************************************************************** */
+static BOOL ln_negotiate_language_help( LNNegotiator* pLn, const char* pstrLangarray )
+{
+	char* pToken;
+	const char* pDelim = " \n\r\t,;";
+	pstring strBuffer;
+
+	rassert(pstrLangarray);
+	rassert(pLn);
+
+	ln_resetln(pLn);
+	pstrcpy(strBuffer, pstrLangarray);
+	pToken = strtok(strBuffer, pDelim);
+	while(pToken != NULL)
+	{
+		if(strncmp(pToken, "q=", strlen("q=")) == 0)
+		{
+			pToken = strtok(NULL, pDelim);
+			continue;
+		}
+		if(!ln_addPreflang(pLn, pToken))
+			break;
+		pToken = strtok(NULL, pDelim);
+	}
+	rassert(ln_getPreflangCount(pLn) != 0);
+	return (ln_getPreflangCount(pLn) != 0);
+}
+/* parse catalog file header and get encoding information.*/
+static BOOL parse_po_header(const char* pheader, pstring pencoding_name)
+{
+	const char *ap_i_v = "Project-Id-Version:";
+	const char *acharset = "charset=";
+	char* penc;
+	int nenc;
+
+	if(pencoding_name == NULL) return False;
+	if(pheader == NULL || *pheader == '\0')
+	{
+		/* error or catalog is not available. */
+		pstrcpy(pencoding_name,"");
+		return False;
+	}
+	penc = strstr(pheader, acharset);
+	if(strncmp(pheader, ap_i_v, strlen(ap_i_v)) != 0 || penc == NULL)
+	{
+		/* catalog file exists, but header is not good.*/
+		pstrcpy(pencoding_name, "");
+		return True;
+	}
+	nenc = strcspn(penc + strlen(acharset), "\n");
+	strncpy(pencoding_name,
+		 penc + strlen(acharset), nenc);
+	return True;
+}
+/* ad-hoc mime charset -> samba encoding name converter.
+   character conversion is done when internal samba data,
+   such as paramters, open files, share names, are going to be displayed.
+   it is only valid for japanese encodings because samba-2.0.7 only has
+   these three character convertors.
+   so other .po file(catalog file) should be encoded with one which
+   samba can deal with (i.e same as DOS codepage).
+
+   display-time conversion is deleted on this version because
+   all catalog files are encoded with samba internal encoding (DOS codepage).
+
+  THIS FUNCTION is ALREADY obsolated and maybe removed soon, -- monyo
+*/
+#define LN_SAMBA_ENCODINGS 3
+static const char* get_samba_enc(const char* penc)
+{
+	int i;
+	static const fstring fdefault = "";
+	static const fstring fmimeenc[LN_SAMBA_ENCODINGS] =
+	{
+		"EUC-JP", "Shift_JIS", "ISO-2022-JP"
+	};
+	static const fstring fsambaenc[LN_SAMBA_ENCODINGS] =
+	{
+		"euc",    "sjis",      "jis"
+	};
+	for(i = 0; i < LN_SAMBA_ENCODINGS; i++)
+	{
+		if(strcasecmp(penc, fmimeenc[i]) == 0)
+			return fsambaenc[i];
+	}
+	return fdefault;
+}
+/* ************************************************************
+ find a better language.
+ if the language specified by web browser matches to a language
+ which is supported by the swat server, this function returns it.
+ *********************************************************** */
+static void set_a_language(const char* planguage)
+{
+	/* included gettext source is affected by
+	   these env.variables without locale settings.
+	*/
+	/*
+	   putenv(env) will not duplicate env argument
+	   but smbw_setenv() does this.
+	*/
+        FILE *file;
+	smbw_setenv("LANGUAGE", planguage);
+	smbw_setenv("LANG", planguage);
+	bindtextdomain(I18N_PACKAGE, I18N_LOCALEDIR);
+	textdomain(I18N_PACKAGE);
+}
+static int ln_set_pref_language(LNNegotiator* pLn)
+{
+	int j;
+	pstring enc_name;
+
+	for(j = 0; j < ln_getPreflangCount(pLn); j++)
+	{
+		set_a_language(ln_getPreflang(pLn, j));
+		/* then check for _("") special entry which has
+		   a lot of information about .po file. */
+		if(parse_po_header(_(""), enc_name))
+		{
+			/* the catalog file must exist and may have
+			   encoding information .*/
+			/*
+			  but in this version, catalog files must be
+			  written with samba-internal encoding (i.e.
+			  dos encoding, dos codepage)
+			  so there is no need to convert.
+			  //ln_init_swat_encoding(get_samba_enc(enc_name));
+			  ln_init_swat_encoding(enc_name);
+			*/
+			return j;
+		}
+	}
+	return LN_NO_AVAILABLE_LANG;
+	/* no available or return the default? */
+}
+/* **************************************************************
+ initialize gettext. Before this, cgi_setup() should be done. 
+ cgi_setup() calls ln_negotiate_language() if the user specifies
+ languages in web browser. Then, ln_set_pref_language() will work.
+ ************************************************************* */
+static BOOL ln_init_lang_env_help(LNNegotiator* pLn)
+{
+#if I18N_GETTEXT
+	int nLang;
+
+	nLang = ln_set_pref_language(pLn);
+	rstrace(getenv("LANGUAGE"));
+#endif /* I18N_GETTEXT */
+	return True;
+}
+/* *****************************************************************
+ * This function searches for the "PrefLang" version of pFile.
+ * if not available, returns pFile.
+ * [pFile] the filename.
+ * [pst] the address of a struct. it will be filled with the information
+ *  of the file.
+ * [pLangDesc] The address of an integer. a value which indicates the
+ * language of the returned value is written to the address. the value
+ * is used in ln_get_lang().
+ * [return value] address of the name of the language version of the file.
+ * It is static object so it will be destroyed at the time ln_get_pref_file()
+ * is called.
+ **************************************************************** */
+static void ln_make_filename( pstring afname, const char* pFile, const char* pAdd )
+{
+#if LANG_PREFIX
+  /* LANG_PREFIX is already undefined, maybe removed soon */
+	/* maybe, foo.html.ja */
+	pstrcpy(afname, pFile);
+	pstrcat(afname, ".");
+	pstrcat(afname, pAdd);
+#else
+	/* maybe, lang/ja/foo.html */
+	pstrcpy(afname, "lang/");
+	pstrcat(afname, pAdd);
+	pstrcat(afname, "/");
+	pstrcat(afname, pFile);
+#endif
+}
+static const char* ln_get_pref_file_help(
+	LNNegotiator* pLn, const char* pFile,
+	 SMB_STRUCT_STAT* pst, int* pLangDesc)
+{
+	static pstring afname;
+	int i;
+
+	for(i = 0; i < ln_getPreflangCount(pLn); i++)
+	{
+		if(strcmp(ln_getPreflang(pLn, i), ln_getOriginalLang(pLn))
+			  == 0)
+			break;
+		ln_make_filename(afname, pFile, ln_getPreflang(pLn, i));
+		if(file_exist(afname, pst))
+		{
+			*pLangDesc = i;
+			return afname;
+		}
+	}
+	pstrcpy(afname, pFile);
+	file_exist(afname, pst);
+	*pLangDesc = LN_LANGDESC_DEFAULT;
+	return afname;
+}
+/* *******************************************************************
+ * file scope variables. this variable is not locked.
+ * (not multithread-safe)
+ ******************************************************************** */
+static LNNegotiator lnLanguagenegotiator;
+
+/* *******************************************************************
+ * interfaces to the outside of this file.
+ ******************************************************************** */
+void ln_initln(void)
+{
+	ln_initln_help(&lnLanguagenegotiator);
+}
+BOOL ln_init_lang_env(void)
+{
+	return ln_init_lang_env_help(&lnLanguagenegotiator);
+}
+const char* ln_get_lang(int nLangDesc)
+{
+	return ln_getPreflang(&lnLanguagenegotiator, nLangDesc);
+}
+const char* ln_get_pref_file(const char* pFile,
+			  SMB_STRUCT_STAT* pst, int* pLangDesc)
+{
+	return ln_get_pref_file_help(
+		&lnLanguagenegotiator, pFile, pst, pLangDesc);
+}
+BOOL ln_negotiate_language(const char* pstrLangarray)
+{
+	return ln_negotiate_language_help(
+		&lnLanguagenegotiator, pstrLangarray);
+}
+const char* ln_get_pref_file_n_o(const char* pFile)
+{
+	SMB_STRUCT_STAT st;
+	int nLangDesc;
+	return ln_get_pref_file(pFile, &st, &nLangDesc);
+}
+#endif /* I18N_SWAT */
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index e930629eee..61bbf67a13 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "webintl.h"
 
 static pid_t smbd_pid;
 
@@ -36,19 +37,19 @@ static void print_share_mode(share_mode_entry *e, char *fname)
 	printf("<tr><td>%d</td>",(int)e->pid);
 	printf("<td>");
 	switch ((e->share_mode>>4)&0xF) {
-	case DENY_NONE: printf("DENY_NONE"); break;
-	case DENY_ALL:  printf("DENY_ALL   "); break;
-	case DENY_DOS:  printf("DENY_DOS   "); break;
-	case DENY_READ: printf("DENY_READ  "); break;
-	case DENY_WRITE:printf("DENY_WRITE "); break;
+	case DENY_NONE: printf(_("DENY_NONE")); break;
+	case DENY_ALL:  printf(_("DENY_ALL   ")); break;
+	case DENY_DOS:  printf(_("DENY_DOS   ")); break;
+	case DENY_READ: printf(_("DENY_READ  ")); break;
+	case DENY_WRITE:printf(_("DENY_WRITE ")); break;
 	}
 	printf("</td>");
 
 	printf("<td>");
 	switch (e->share_mode&0xF) {
-	case 0: printf("RDONLY     "); break;
-	case 1: printf("WRONLY     "); break;
-	case 2: printf("RDWR       "); break;
+	case 0: printf(_("RDONLY     ")); break;
+	case 1: printf(_("WRONLY     ")); break;
+	case 2: printf(_("RDWR       ")); break;
 	}
 	printf("</td>");
 
@@ -56,15 +57,15 @@ static void print_share_mode(share_mode_entry *e, char *fname)
 	if((e->op_type & 
 	    (EXCLUSIVE_OPLOCK|BATCH_OPLOCK)) == 
 	   (EXCLUSIVE_OPLOCK|BATCH_OPLOCK))
-		printf("EXCLUSIVE+BATCH ");
+		printf(_("EXCLUSIVE+BATCH "));
 	else if (e->op_type & EXCLUSIVE_OPLOCK)
-		printf("EXCLUSIVE       ");
+		printf(_("EXCLUSIVE       "));
 	else if (e->op_type & BATCH_OPLOCK)
-		printf("BATCH           ");
+		printf(_("BATCH           "));
 	else if (e->op_type & LEVEL_II_OPLOCK)
-		printf("LEVEL_II        ");
+		printf(_("LEVEL_II        "));
 	else
-		printf("NONE            ");
+		printf(_("NONE            "));
 	printf("</td>");
 
 	printf("<td>%s</td><td>%s</td></tr>\n",
@@ -107,7 +108,7 @@ static int traverse_fn2(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 
 	printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td>\n",
 	       (int)crec.pid,
-	       crec.machine,crec.addr,
+	       crec.machine, crec.addr,
 	       tstring(crec.start));
 	if (geteuid() == 0) {
 		printf("<td><input type=submit value=\"X\" name=\"kill_%d\"></td>\n",
@@ -190,18 +191,18 @@ void status_page(void)
 	tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
 	if (tdb) tdb_traverse(tdb, traverse_fn1, NULL);
 
-	printf("<H2>Server Status</H2>\n");
+	printf("<H2>%s</H2>\n", _("Server Status"));
 
 	printf("<FORM method=post>\n");
 
 	if (!autorefresh) {
-		printf("<input type=submit value=\"Auto Refresh\" name=autorefresh>\n");
-		printf("<br>Refresh Interval: ");
+		printf("<input type=submit value=\"%s\" name=autorefresh>\n", _("Auto Refresh"));
+		printf("<br>%s", _("Refresh Interval: "));
 		printf("<input type=text size=2 name=\"refresh_interval\" value=%d>\n", 
 		       refresh_interval);
 	} else {
-		printf("<input type=submit value=\"Stop Refreshing\" name=norefresh>\n");
-		printf("<br>Refresh Interval: %d\n", refresh_interval);
+		printf("<input type=submit value=\"%s\" name=norefresh>\n", _("Stop Refreshing"));
+		printf("<br>%s%d\n", _("Refresh Interval: "), refresh_interval);
 		printf("<input type=hidden name=refresh value=1>\n");
 	}
 
@@ -215,40 +216,40 @@ void status_page(void)
 
 	printf("<table>\n");
 
-	printf("<tr><td>version:</td><td>%s</td></tr>",VERSION);
+	printf("<tr><td>%s</td><td>%s</td></tr>", _("version:"), VERSION);
 
 	fflush(stdout);
-	printf("<tr><td>smbd:</td><td>%srunning</td>\n",smbd_running()?"":"not ");
+	printf("<tr><td>%s</td><td>%s</td>\n", _("smbd:"), smbd_running()?_("running"):_("not running"));
 	if (geteuid() == 0) {
 	    if (smbd_running()) {
-		printf("<td><input type=submit name=\"smbd_stop\" value=\"Stop smbd\"></td>\n");
+		printf("<td><input type=submit name=\"smbd_stop\" value=\"%s\"></td>\n", _("Stop smbd"));
 	    } else {
-		printf("<td><input type=submit name=\"smbd_start\" value=\"Start smbd\"></td>\n");
+		printf("<td><input type=submit name=\"smbd_start\" value=\"%s\"></td>\n", _("Start smbd"));
 	    }
-	    printf("<td><input type=submit name=\"smbd_restart\" value=\"Restart smbd\"></td>\n");
+	    printf("<td><input type=submit name=\"smbd_restart\" value=\"%s\"></td>\n", _("Restart smbd"));
 	}
 	printf("</tr>\n");
 
 	fflush(stdout);
-	printf("<tr><td>nmbd:</td><td>%srunning</td>\n",nmbd_running()?"":"not ");
+	printf("<tr><td>%s</td><td>%s</td>\n", _("nmbd:"), nmbd_running()?_("running"):_("not running"));
 	if (geteuid() == 0) {
 	    if (nmbd_running()) {
-		printf("<td><input type=submit name=\"nmbd_stop\" value=\"Stop nmbd\"></td>\n");
+		printf("<td><input type=submit name=\"nmbd_stop\" value=\"%s\"></td>\n", _("Stop nmbd"));
 	    } else {
-		printf("<td><input type=submit name=\"nmbd_start\" value=\"Start nmbd\"></td>\n");
+		printf("<td><input type=submit name=\"nmbd_start\" value=\"%s\"></td>\n", _("Start nmbd"));
 	    }
-	    printf("<td><input type=submit name=\"nmbd_restart\" value=\"Restart nmbd\"></td>\n");
+	    printf("<td><input type=submit name=\"nmbd_restart\" value=\"%s\"></td>\n", _("Restart nmbd"));
 	}
 	printf("</tr>\n");
 
 	printf("</table>\n");
 	fflush(stdout);
 
-	printf("<p><h3>Active Connections</h3>\n");
+	printf("<p><h3>%s</h3>\n", _("Active Connections"));
 	printf("<table border=1>\n");
-	printf("<tr><th>PID</th><th>Client</th><th>IP address</th><th>Date</th>\n");
+	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th>\n", _("PID"), _("Client"), _("IP address"), _("Date"));
 	if (geteuid() == 0) {
-		printf("<th>Kill</th>\n");
+		printf("<th>%s</th>\n", _("Kill"));
 	}
 	printf("</tr>\n");
 
@@ -256,17 +257,18 @@ void status_page(void)
 
 	printf("</table><p>\n");
 
-	printf("<p><h3>Active Shares</h3>\n");
+	printf("<p><h3>%s</h3>\n", _("Active Shares"));
 	printf("<table border=1>\n");
-	printf("<tr><th>Share</th><th>User</th><th>Group</th><th>PID</th><th>Client</th><th>Date</th></tr>\n\n");
+	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n\n",
+		_("Share"), _("User"), _("Group"), _("PID"), _("Client"), _("Date"));
 
 	if (tdb) tdb_traverse(tdb, traverse_fn3, NULL);
 
 	printf("</table><p>\n");
 
-	printf("<h3>Open Files</h3>\n");
+	printf("<h3>%s</h3>\n", _("Open Files"));
 	printf("<table border=1>\n");
-	printf("<tr><th>PID</th><th>Sharing</th><th>R/W</th><th>Oplock</th><th>File</th><th>Date</th></tr>\n");
+	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n", _("PID"), _("Sharing"), _("R/W"), _("Oplock"), _("File"), _("Date"));
 
 	locking_init(1);
 	share_mode_forall(print_share_mode);
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 9a7658e94f..664780995e 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "smb.h"
+#include "webintl.h"
 
 #define GLOBALS_SNUM -1
 
@@ -109,12 +110,14 @@ static char *make_parm_name(char *label)
 ****************************************************************************/
 static int include_html(char *fname)
 {
-	FILE *f = sys_fopen(fname,"r");
+	FILE *f;
 	char buf[1024];
 	int ret;
 
+	f = sys_fopen((char*)LN_(fname), "r");
+
 	if (!f) {
-		d_printf("ERROR: Can't open %s\n", fname);
+		d_printf(_("ERROR: Can't open %s\n"), fname);
 		return 0;
 	}
 
@@ -144,6 +147,38 @@ static void print_header(void)
 	}
 }
 
+/* *******************************************************************
+   show parameter label with translated name in the following form
+   because showing original and translated label in one line looks
+   too long, and showing translated label only is unusable for
+   heavy users.
+   -------------------------------
+   HELP       security   [combo box][button]
+   SECURITY
+   -------------------------------
+   (capital words are translated by gettext.)
+   if no translation is available, then same form as original is
+   used.
+   "i18n_translated_parm" class is used to change the color of the
+   translated parameter with CSS.
+   **************************************************************** */
+static const char* get_parm_translated(
+	const char* pAnchor, const char* pHelp, const char* pLabel)
+{
+	const char* pTranslated = _(pLabel);
+	static pstring output;
+	if(strcmp(pLabel, pTranslated) != 0)
+	{
+		snprintf(output, sizeof(output),
+		  "<A HREF=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
+		   pAnchor, pHelp, pLabel, pTranslated);
+		return output;
+	}
+	snprintf(output, sizeof(output), 
+	  "<A HREF=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s",
+	  pAnchor, pHelp, pLabel);
+	return output;
+}
 /****************************************************************************
  finish off the page 
 ****************************************************************************/
@@ -167,17 +202,13 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		ptr = lp_local_ptr(snum, ptr);
 	}
 
-	str = stripspace(parm->label);
-	strupper (str);
-	d_printf("<tr><td><A HREF=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\">Help</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s</td><td>", 
-	       str, parm->label);
-
+	printf("<tr><td>%s</td><td>", get_parm_translated(stripspace(parm->label), _("Help"), parm->label));
 	switch (parm->type) {
 	case P_CHAR:
 		d_printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",
 		       make_parm_name(parm->label), *(char *)ptr);
-		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%c\'\">",
-			make_parm_name(parm->label),(char)(parm->def.cvalue));
+		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%c\'\">",
+			_("Set Default"), make_parm_name(parm->label),(char)(parm->def.cvalue));
 		break;
 
 	case P_LIST:
@@ -190,8 +221,8 @@ static void show_parameter(int snum, struct parm_struct *parm)
 			}
 		}
 		d_printf("\">");
-		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'",
-			make_parm_name(parm->label));
+		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'",
+			_("Set Default"), make_parm_name(parm->label));
 		if (parm->def.lvalue) {
 			char **list = (char **)(parm->def.lvalue);
 			for (; *list; list++) {
@@ -205,16 +236,16 @@ static void show_parameter(int snum, struct parm_struct *parm)
 	case P_USTRING:
 		d_printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
 		       make_parm_name(parm->label), *(char **)ptr);
-		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
-			make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
+		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
 		break;
 
 	case P_GSTRING:
 	case P_UGSTRING:
 		d_printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
 		       make_parm_name(parm->label), (char *)ptr);
-		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
-			make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
+		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
 		break;
 
 	case P_BOOL:
@@ -222,8 +253,8 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		d_printf("<option %s>Yes", (*(BOOL *)ptr)?"selected":"");
 		d_printf("<option %s>No", (*(BOOL *)ptr)?"":"selected");
 		d_printf("</select>");
-		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
-			make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?0:1);
+		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
+			_("Set Default"), make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?0:1);
 		break;
 
 	case P_BOOLREV:
@@ -231,20 +262,20 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		d_printf("<option %s>Yes", (*(BOOL *)ptr)?"":"selected");
 		d_printf("<option %s>No", (*(BOOL *)ptr)?"selected":"");
 		d_printf("</select>");
-		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
-			make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?1:0);
+		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
+			_("Set Default"), make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?1:0);
 		break;
 
 	case P_INTEGER:
 		d_printf("<input type=text size=8 name=\"parm_%s\" value=%d>", make_parm_name(parm->label), *(int *)ptr);
-		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%d\'\">",
-			make_parm_name(parm->label),(int)(parm->def.ivalue));
+		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%d\'\">",
+			_("Set Default"), make_parm_name(parm->label),(int)(parm->def.ivalue));
 		break;
 
 	case P_OCTAL:
 		d_printf("<input type=text size=8 name=\"parm_%s\" value=%s>", make_parm_name(parm->label), octal_string(*(int *)ptr));
-		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
-		       make_parm_name(parm->label),
+		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+		       _("Set Default"), make_parm_name(parm->label),
 		       octal_string((int)(parm->def.ivalue)));
 		break;
 
@@ -256,8 +287,8 @@ static void show_parameter(int snum, struct parm_struct *parm)
 			}
 		}
 		d_printf("</select>");
-		d_printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
-			make_parm_name(parm->label),enum_index((int)(parm->def.ivalue),parm->enum_list));
+		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
+			_("Set Default"), make_parm_name(parm->label),enum_index((int)(parm->def.ivalue),parm->enum_list));
 		break;
 	case P_SEP:
 		break;
@@ -335,7 +366,7 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 			if (printers && !(parm->flags & FLAG_PRINT)) continue;
 		}
 		if (heading && heading != last_heading) {
-			d_printf("<tr><td></td></tr><tr><td><b><u>%s</u></b></td></tr>\n", heading);
+			d_printf("<tr><td></td></tr><tr><td><b><u>%s</u></b></td></tr>\n", _(heading));
 			last_heading = heading;
 		}
 		show_parameter(snum, parm);
@@ -460,20 +491,20 @@ static void show_main_buttons(void)
 	char *p;
 	
 	if ((p = cgi_user_name()) && strcmp(p, "root")) {
-		d_printf("Logged in as <b>%s</b><p>\n", p);
+		d_printf(_("Logged in as <b>%s</b><p>\n"), p);
 	}
 
-	image_link("Home", "", "images/home.gif");
+	image_link(_("Home"), "", "images/home.gif");
 	if (have_write_access) {
-		image_link("Globals", "globals", "images/globals.gif");
-		image_link("Shares", "shares", "images/shares.gif");
-		image_link("Printers", "printers", "images/printers.gif");
+		image_link(_("Globals"), "globals", "images/globals.gif");
+		image_link(_("Shares"), "shares", "images/shares.gif");
+		image_link(_("Printers"), "printers", "images/printers.gif");
 	}
 	if (have_read_access) {
-		image_link("Status", "status", "images/status.gif");
-		image_link("View Config", "viewconfig","images/viewconfig.gif");
+		image_link(_("Status"), "status", "images/status.gif");
+		image_link(_("View Config"), "viewconfig", "images/viewconfig.gif");
 	}
-	image_link("Password Management", "passwd", "images/passwd.gif");
+	image_link(_("Password Management"), "passwd", "images/passwd.gif");
 
 	d_printf("<HR>\n");
 }
@@ -497,13 +528,13 @@ static void viewconfig_page(void)
 		full_view = 1;
 	}
 
-	d_printf("<H2>Current Config</H2>\n");
+	d_printf("<H2>%s</H2>\n", _("Current Config"));
 	d_printf("<form method=post>\n");
 
 	if (full_view) {
-		d_printf("<input type=submit name=\"normal_view\" value=\"Normal View\">\n");
+		d_printf("<input type=submit name=\"normal_view\" value=\"%s\">\n", _("Normal View"));
 	} else {
-		d_printf("<input type=submit name=\"full_view\" value=\"Full View\">\n");
+		d_printf("<input type=submit name=\"full_view\" value=\"%s\">\n", _("Full View"));
 	}
 
 	d_printf("<p><pre>");
@@ -519,7 +550,7 @@ static void globals_page(void)
 {
 	int advanced = 0;
 
-	d_printf("<H2>Global Variables</H2>\n");
+	d_printf("<H2>%s</H2>\n", _("Global Variables"));
 
 	if (cgi_variable("Advanced") && !cgi_variable("Basic"))
 		advanced = 1;
@@ -532,14 +563,16 @@ static void globals_page(void)
 	d_printf("<FORM name=\"swatform\" method=post>\n");
 
 	if (have_write_access) {
-		d_printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+		d_printf("<input type=submit name=\"Commit\" value=\"%s\">\n",
+			_("Commit Changes"));
 	}
 
-	d_printf("<input type=reset name=\"Reset Values\" value=\"Reset Values\">\n");
+	d_printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", 
+		 _("Reset Values"));
 	if (advanced == 0) {
-		d_printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
+		d_printf("<input type=submit name=\"Advanced\" value=\"%s\">\n", _("Advanced View"));
 	} else {
-		d_printf("<input type=submit name=\"Basic\" value=\"Basic View\">\n");
+		d_printf("<input type=submit name=\"Basic\" value=\"%s\">\n", _("Basic View"));
 	}
 	d_printf("<p>\n");
 	
@@ -562,14 +595,14 @@ static void shares_page(void)
 {
 	char *share = cgi_variable("share");
 	char *s;
-	int snum=-1;
+	int snum = -1;
 	int i;
 	int advanced = 0;
 
 	if (share)
 		snum = lp_servicenumber(share);
 
-	d_printf("<H2>Share Parameters</H2>\n");
+	d_printf("<H2>%s</H2>\n", _("Share Parameters"));
 
 	if (cgi_variable("Advanced") && !cgi_variable("Basic"))
 		advanced = 1;
@@ -598,7 +631,7 @@ static void shares_page(void)
 
 	d_printf("<table>\n");
 	d_printf("<tr>\n");
-	d_printf("<td><input type=submit name=selectshare value=\"Choose Share\"></td>\n");
+	d_printf("<td><input type=submit name=selectshare value=\"%s\"></td>\n", _("Choose Share"));
 	d_printf("<td><select name=share>\n");
 	if (snum < 0)
 		d_printf("<option value=\" \"> \n");
@@ -612,14 +645,14 @@ static void shares_page(void)
 	}
 	d_printf("</select></td>\n");
 	if (have_write_access) {
-		d_printf("<td><input type=submit name=\"Delete\" value=\"Delete Share\"></td>\n");
+		d_printf("<td><input type=submit name=\"Delete\" value=\"%s\"></td>\n", _("Delete Share"));
 	}
 	d_printf("</tr>\n");
 	d_printf("</table>");
 	d_printf("<table>");
 	if (have_write_access) {
 		d_printf("<tr>\n");
-		d_printf("<td><input type=submit name=createshare value=\"Create Share\"></td>\n");
+		d_printf("<td><input type=submit name=createshare value=\"%s\"></td>\n", _("Create Share"));
 		d_printf("<td><input type=text size=30 name=newshare></td></tr>\n");
 	}
 	d_printf("</table>");
@@ -627,14 +660,14 @@ static void shares_page(void)
 
 	if (snum >= 0) {
 		if (have_write_access) {
-			d_printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+			d_printf("<input type=submit name=\"Commit\" value=\"%s\">\n", _("Commit Changes"));
 		}
 
-		d_printf("<input type=reset name=\"Reset Values\" value=\"Reset Values\">\n");
+		d_printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", _("Reset Values"));
 		if (advanced == 0) {
-			d_printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
+			d_printf("<input type=submit name=\"Advanced\" value=\"%s\">\n", _("Advanced View"));
 		} else {
-			d_printf("<input type=submit name=\"Basic\" value=\"Basic View\">\n");
+			d_printf("<input type=submit name=\"Basic\" value=\"%s\">\n", _("Basic View"));
 		}
 		d_printf("<p>\n");
 	}
@@ -664,7 +697,7 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 	pstring msg_str;
 
 	if (demo_mode) {
-		d_printf("password change in demo mode rejected\n<p>");
+		d_printf("%s<p>", _("password change in demo mode rejected\n"));
 		return False;
 	}
 	
@@ -703,7 +736,7 @@ static void chg_passwd(void)
 
 	/* Make sure users name has been specified */
 	if (strlen(cgi_variable(SWAT_USER)) == 0) {
-		d_printf("<p> Must specify \"User Name\" \n");
+		d_printf("<p>%s", _(" Must specify \"User Name\" \n"));
 		return;
 	}
 
@@ -719,26 +752,26 @@ static void chg_passwd(void)
 		 */
 		if (((!am_root()) && (strlen( cgi_variable(OLD_PSWD)) <= 0)) ||
 		    ((cgi_variable(CHG_R_PASSWD_FLAG)) &&  (strlen( cgi_variable(OLD_PSWD)) <= 0))) {
-			d_printf("<p> Must specify \"Old Password\" \n");
+			d_printf("<p>%s", _(" Must specify \"Old Password\" \n"));
 			return;
 		}
 
 		/* If changing a users password on a remote hosts we have to know what host */
 		if ((cgi_variable(CHG_R_PASSWD_FLAG)) && (strlen( cgi_variable(RHOST)) <= 0)) {
-			d_printf("<p> Must specify \"Remote Machine\" \n");
+			d_printf("<p>%s", _(" Must specify \"Remote Machine\" \n"));
 			return;
 		}
 
 		/* Make sure new passwords have been specified */
 		if ((strlen( cgi_variable(NEW_PSWD)) <= 0) ||
 		    (strlen( cgi_variable(NEW2_PSWD)) <= 0)) {
-			d_printf("<p> Must specify \"New, and Re-typed Passwords\" \n");
+			d_printf("<p>%s", _(" Must specify \"New, and Re-typed Passwords\" \n"));
 			return;
 		}
 
 		/* Make sure new passwords was typed correctly twice */
 		if (strcmp(cgi_variable(NEW_PSWD), cgi_variable(NEW2_PSWD)) != 0) {
-			d_printf("<p> Re-typed password didn't match new password\n");
+			d_printf("<p>%s", _(" Re-typed password didn't match new password\n"));
 			return;
 		}
 	}
@@ -766,10 +799,11 @@ static void chg_passwd(void)
 				   local_flags);
 
 	if(local_flags == 0) {
+		d_printf("<p>");
 		if (rslt == True) {
-			d_printf("<p> The passwd for '%s' has been changed. \n", cgi_variable(SWAT_USER));
+			d_printf(_(" The passwd for '%s' has been changed. \n"), cgi_variable(SWAT_USER));
 		} else {
-			d_printf("<p> The passwd for '%s' has NOT been changed. \n",cgi_variable(SWAT_USER));
+			d_printf(_(" The passwd for '%s' has NOT been changed. \n"), cgi_variable(SWAT_USER));
 		}
 	}
 	
@@ -793,7 +827,7 @@ static void passwd_page(void)
 
 	if (!new_name) new_name = "";
 
-	d_printf("<H2>Server Password Management</H2>\n");
+	d_printf("<H2>%s</H2>\n", _("Server Password Management"));
 
 	d_printf("<FORM name=\"swatform\" method=post>\n");
 
@@ -802,32 +836,32 @@ static void passwd_page(void)
 	/* 
 	 * Create all the dialog boxes for data collection
 	 */
-	d_printf("<tr><td> User Name : </td>\n");
+	d_printf("<tr><td>%s</td>\n", _(" User Name : "));
 	d_printf("<td><input type=text size=30 name=%s value=%s></td></tr> \n", SWAT_USER, new_name);
 	if (!am_root()) {
-		d_printf("<tr><td> Old Password : </td>\n");
+		d_printf("<tr><td>%s</td>\n", _(" Old Password : "));
 		d_printf("<td><input type=password size=30 name=%s></td></tr> \n",OLD_PSWD);
 	}
-	d_printf("<tr><td> New Password : </td>\n");
+	d_printf("<tr><td>%s</td>\n", _(" New Password : "));
 	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
-	d_printf("<tr><td> Re-type New Password : </td>\n");
+	d_printf("<tr><td>%s</td>\n", _(" Re-type New Password : "));
 	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
 	d_printf("</table>\n");
 
 	/*
 	 * Create all the control buttons for requesting action
 	 */
-	d_printf("<input type=submit name=%s value=\"Change Password\">\n", 
-	       CHG_S_PASSWD_FLAG);
+	d_printf("<input type=submit name=%s value=\"%s\">\n", 
+	       CHG_S_PASSWD_FLAG, _("Change Password"));
 	if (demo_mode || am_root()) {
-		d_printf("<input type=submit name=%s value=\"Add New User\">\n",
-		       ADD_USER_FLAG);
-		d_printf("<input type=submit name=%s value=\"Delete User\">\n",
-		       DELETE_USER_FLAG);
-		d_printf("<input type=submit name=%s value=\"Disable User\">\n", 
-		       DISABLE_USER_FLAG);
-		d_printf("<input type=submit name=%s value=\"Enable User\">\n", 
-		       ENABLE_USER_FLAG);
+		d_printf("<input type=submit name=%s value=\"%s\">\n",
+		       ADD_USER_FLAG, _("Add New User"));
+		d_printf("<input type=submit name=%s value=\"%s\">\n",
+		       DELETE_USER_FLAG, _("Delete User"));
+		d_printf("<input type=submit name=%s value=\"%s\">\n", 
+		       DISABLE_USER_FLAG, _("Disable User"));
+		d_printf("<input type=submit name=%s value=\"%s\">\n", 
+		       ENABLE_USER_FLAG, _("Enable User"));
 	}
 	d_printf("<p></FORM>\n");
 
@@ -840,7 +874,7 @@ static void passwd_page(void)
 		chg_passwd();		
 	}
 
-	d_printf("<H2>Client/Server Password Management</H2>\n");
+	d_printf("<H2>%s</H2>\n", _("Client/Server Password Management"));
 
 	d_printf("<FORM name=\"swatform\" method=post>\n");
 
@@ -849,15 +883,15 @@ static void passwd_page(void)
 	/* 
 	 * Create all the dialog boxes for data collection
 	 */
-	d_printf("<tr><td> User Name : </td>\n");
+	d_printf("<tr><td>%s</td>\n", _(" User Name : "));
 	d_printf("<td><input type=text size=30 name=%s value=%s></td></tr>\n",SWAT_USER, new_name);
-	d_printf("<tr><td> Old Password : </td>\n");
+	d_printf("<tr><td>%s</td>\n", _(" Old Password : "));
 	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",OLD_PSWD);
-	d_printf("<tr><td> New Password : </td>\n");
+	d_printf("<tr><td>%s</td>\n", _(" New Password : "));
 	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
-	d_printf("<tr><td> Re-type New Password : </td>\n");
+	d_printf("<tr><td>%s</td>\n", _(" Re-type New Password : "));
 	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
-	d_printf("<tr><td> Remote Machine : </td>\n");
+	d_printf("<tr><td>%s</td>\n", _(" Remote Machine : "));
 	d_printf("<td><input type=text size=30 name=%s></td></tr>\n",RHOST);
 
 	d_printf("</table>");
@@ -865,8 +899,8 @@ static void passwd_page(void)
 	/*
 	 * Create all the control buttons for requesting action
 	 */
-	d_printf("<input type=submit name=%s value=\"Change Password\">", 
-	       CHG_R_PASSWD_FLAG);
+	d_printf("<input type=submit name=%s value=\"%s\">", 
+	       CHG_R_PASSWD_FLAG, _("Change Password"));
 
 	d_printf("<p></FORM>\n");
 
@@ -895,13 +929,13 @@ static void printers_page(void)
 	if (share)
 		snum = lp_servicenumber(share);
 
-	d_printf("<H2>Printer Parameters</H2>\n");
-
-	d_printf("<H3>Important Note:</H3>\n");
-	d_printf("Printer names marked with [*] in the Choose Printer drop-down box ");
-	d_printf("are autoloaded printers from ");
-	d_printf("<A HREF=\"/swat/help/smb.conf.5.html#PRINTCAPNAME\" target=\"docs\">Printcap Name</A>.\n");
-	d_printf("Attempting to delete these printers from SWAT will have no effect.\n");
+        d_printf("<H2>%s</H2>\n", _("Printer Parameters"));
+ 
+        d_printf("<H3>%s</H3>\n", _("Important Note:"));
+        d_printf(_("Printer names marked with [*] in the Choose Printer drop-down box "));
+        d_printf(_("are autoloaded printers from "));
+        d_printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
+        d_printf(_("Attempting to delete these printers from SWAT will have no effect.\n"));
 
 	if (cgi_variable("Advanced") && !cgi_variable("Basic"))
 		advanced = 1;
@@ -934,7 +968,7 @@ static void printers_page(void)
 	d_printf("<FORM name=\"swatform\" method=post>\n");
 
 	d_printf("<table>\n");
-	d_printf("<tr><td><input type=submit name=selectshare value=\"Choose Printer\"></td>\n");
+	d_printf("<tr><td><input type=submit name=selectshare value=\"%s\"></td>\n", _("Choose Printer"));
 	d_printf("<td><select name=share>\n");
 	if (snum < 0 || !lp_print_ok(snum))
 		d_printf("<option value=\" \"> \n");
@@ -953,14 +987,14 @@ static void printers_page(void)
 	}
 	d_printf("</select></td>");
 	if (have_write_access) {
-		d_printf("<td><input type=submit name=\"Delete\" value=\"Delete Printer\"></td>\n");
+		d_printf("<td><input type=submit name=\"Delete\" value=\"%s\"></td>\n", _("Delete Printer"));
 	}
 	d_printf("</tr>");
 	d_printf("</table>\n");
 
 	if (have_write_access) {
 		d_printf("<table>\n");
-		d_printf("<tr><td><input type=submit name=createshare value=\"Create Printer\"></td>\n");
+		d_printf("<tr><td><input type=submit name=createshare value=\"%s\"></td>\n", _("Create Printer"));
 		d_printf("<td><input type=text size=30 name=newshare></td></tr>\n");
 		d_printf("</table>");
 	}
@@ -968,13 +1002,13 @@ static void printers_page(void)
 
 	if (snum >= 0) {
 		if (have_write_access) {
-			d_printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+			d_printf("<input type=submit name=\"Commit\" value=\"%s\">\n", _("Commit Changes"));
 		}
-		d_printf("<input type=reset name=\"Reset Values\" value=\"Reset Values\">\n");
+		d_printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", _("Reset Values"));
 		if (advanced == 0) {
-			d_printf("<input type=submit name=\"Advanced\" value=\"Advanced View\">\n");
+			d_printf("<input type=submit name=\"Advanced\" value=\"%s\">\n", _("Advanced View"));
 		} else {
-			d_printf("<input type=submit name=\"Basic\" value=\"Basic View\">\n");
+			d_printf("<input type=submit name=\"Basic\" value=\"%s\">\n", _("Basic View"));
 		}
 		d_printf("<p>\n");
 	}
@@ -1038,10 +1072,16 @@ static void printers_page(void)
 	iNumNonAutoPrintServices = lp_numservices();
 	load_printers();
 
+#if I18N_SWAT
+	ln_initln();
+	cgi_setup(SWATDIR, !demo_mode);
+	ln_init_lang_env();
+#else
 	cgi_setup(SWATDIR, !demo_mode);
 
+#endif
 	print_header();
-	
+
 	cgi_load_variables();
 
 	if (!file_exist(servicesf, NULL)) {
@@ -1057,7 +1097,6 @@ static void printers_page(void)
 		have_read_access = (access(servicesf,R_OK) == 0);
 	}
 
-
 	show_main_buttons();
 
 	page = cgi_pathinfo();
-- 
cgit 


From 6ddcd8a3bcef32694d9d753ff91cced71f5ca3a8 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 25 Sep 2001 20:21:21 +0000
Subject: Fixup passdb stuff to add new nisplus and ldap backends. Jeremy.
 (This used to be commit 611bf806d569b70edabbc04a2f5408142370a550)

---
 source3/web/cgi.c  | 2 ++
 source3/web/swat.c | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index d2b30c49e9..caba28396f 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -448,7 +448,9 @@ static void cgi_download(char *file)
 	char buf[1024];
 	int fd, l, i;
 	char *p;
+#if I18N_SWAT
 	int nLangDesc;
+#endif
 
 	/* sanitise the filename */
 	for (i=0;file[i];i++) {
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 664780995e..a6286dc93b 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -196,7 +196,6 @@ static void show_parameter(int snum, struct parm_struct *parm)
 {
 	int i;
 	void *ptr = parm->ptr;
-	char* str;
 
 	if (parm->class == P_LOCAL && snum >= 0) {
 		ptr = lp_local_ptr(snum, ptr);
-- 
cgit 


From 8ad2982968478d91c9f799808195baf818d4fdae Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Sat, 6 Oct 2001 18:03:25 +0000
Subject: merge from 2.2 (This used to be commit
 831530d93d606d13a792be1d3d4ac561697504d8)

---
 source3/web/statuspage.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 84 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 61bbf67a13..b49fc7b656 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -22,8 +22,79 @@
 #include "includes.h"
 #include "webintl.h"
 
+#define PIDMAP		struct PidMap
+
+PIDMAP {
+	PIDMAP	*next, *prev;
+	pid_t	pid;
+	char	*machine;
+};
+
+static PIDMAP	*pidmap;
+static int	PID_or_Machine;		/* 0 = show PID, else show Machine name */
+
 static pid_t smbd_pid;
 
+/* from 2nd call on, remove old list */
+static void initPid2Machine (void)
+{
+	/* show machine name rather PID on table "Open Files"? */
+	if (PID_or_Machine) {
+		PIDMAP *p, *q;
+
+		for (p = pidmap; p != NULL; ) {
+			DLIST_REMOVE(pidmap, p);
+			SAFE_FREE(p->machine);
+			SAFE_FREE(p);
+		}
+
+		pidmap = NULL;
+	}
+}
+
+/* add new PID <-> Machine name mapping */
+static void addPid2Machine (pid_t pid, char *machine)
+{
+	/* show machine name rather PID on table "Open Files"? */
+	if (PID_or_Machine) {
+		PIDMAP *newmap;
+
+		if ((newmap = (PIDMAP *) malloc (sizeof (PIDMAP))) == NULL) {
+			/* XXX need error message for this?
+			   if malloc fails, PID is always shown */
+			return;
+		}
+
+		newmap->pid = pid;
+		newmap->machine = strdup (machine);
+
+		DLIST_ADD(pidmap, newmap);
+	}
+}
+
+/* lookup PID <-> Machine name mapping */
+static char *mapPid2Machine (pid_t pid)
+{
+	static char pidbuf [64];
+	PIDMAP *map;
+
+	/* show machine name rather PID on table "Open Files"? */
+	if (PID_or_Machine) {
+		for (map = pidmap; map != NULL; map = map->next) {
+			if (pid == map->pid) {
+				if (map->machine == NULL)	/* no machine name */
+					break;			/* show PID */
+
+				return map->machine;
+			}
+		}
+	}
+
+	/* PID not in list or machine name NULL? return pid as string */
+	snprintf (pidbuf, sizeof (pidbuf) - 1, "%d", pid);
+	return pidbuf;
+}
+
 static char *tstring(time_t t)
 {
 	static pstring buf;
@@ -34,7 +105,7 @@ static char *tstring(time_t t)
 
 static void print_share_mode(share_mode_entry *e, char *fname)
 {
-	printf("<tr><td>%d</td>",(int)e->pid);
+	printf("<tr><td>%s</td>",_(mapPid2Machine(e->pid)));
 	printf("<td>");
 	switch ((e->share_mode>>4)&0xF) {
 	case DENY_NONE: printf(_("DENY_NONE")); break;
@@ -106,9 +177,11 @@ static int traverse_fn2(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 	if (crec.cnum != -1 || !process_exists(crec.pid) || (crec.pid == smbd_pid))
 		return 0;
 
+	addPid2Machine (crec.pid, crec.machine);
+
 	printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td>\n",
 	       (int)crec.pid,
-	       crec.machine, crec.addr,
+	       crec.machine,crec.addr,
 	       tstring(crec.start));
 	if (geteuid() == 0) {
 		printf("<td><input type=submit value=\"X\" name=\"kill_%d\"></td>\n",
@@ -188,8 +261,14 @@ void status_page(void)
 		refresh_interval = atoi(v);
 	}
 
+	if (cgi_variable("show_client_in_col_1")) {
+		PID_or_Machine = 1;
+	}
+
 	tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
 	if (tdb) tdb_traverse(tdb, traverse_fn1, NULL);
+ 
+	initPid2Machine ();
 
 	printf("<H2>%s</H2>\n", _("Server Status"));
 
@@ -277,6 +356,9 @@ void status_page(void)
 
 	if (tdb) tdb_close(tdb);
 
+	printf("<br><input type=submit name=\"show_client_in_col_1\" value=\"Show Client in col 1\">\n");
+	printf("<input type=submit name=\"show_pid_in_col_1\" value=\"Show PID in col 1\">\n");
+
 	printf("</FORM>\n");
 
 	if (autorefresh) {
-- 
cgit 


From 8cec5cf35f17568009c70d37bb8b2a1f360d3422 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 11 Oct 2001 08:40:42 +0000
Subject: first step in converting the head branch to use lang_tdb.c instead of
 gettext for internationalisation support. There is more to do (This used to
 be commit ab7f67677a1ade4669e5c2750d0a38422ea616a9)

---
 source3/web/neg_lang.c | 107 -------------------------------------------------
 1 file changed, 107 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index 8cb41a34ec..32f52aa473 100644
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -161,114 +161,7 @@ static BOOL ln_negotiate_language_help( LNNegotiator* pLn, const char* pstrLanga
 	rassert(ln_getPreflangCount(pLn) != 0);
 	return (ln_getPreflangCount(pLn) != 0);
 }
-/* parse catalog file header and get encoding information.*/
-static BOOL parse_po_header(const char* pheader, pstring pencoding_name)
-{
-	const char *ap_i_v = "Project-Id-Version:";
-	const char *acharset = "charset=";
-	char* penc;
-	int nenc;
-
-	if(pencoding_name == NULL) return False;
-	if(pheader == NULL || *pheader == '\0')
-	{
-		/* error or catalog is not available. */
-		pstrcpy(pencoding_name,"");
-		return False;
-	}
-	penc = strstr(pheader, acharset);
-	if(strncmp(pheader, ap_i_v, strlen(ap_i_v)) != 0 || penc == NULL)
-	{
-		/* catalog file exists, but header is not good.*/
-		pstrcpy(pencoding_name, "");
-		return True;
-	}
-	nenc = strcspn(penc + strlen(acharset), "\n");
-	strncpy(pencoding_name,
-		 penc + strlen(acharset), nenc);
-	return True;
-}
-/* ad-hoc mime charset -> samba encoding name converter.
-   character conversion is done when internal samba data,
-   such as paramters, open files, share names, are going to be displayed.
-   it is only valid for japanese encodings because samba-2.0.7 only has
-   these three character convertors.
-   so other .po file(catalog file) should be encoded with one which
-   samba can deal with (i.e same as DOS codepage).
 
-   display-time conversion is deleted on this version because
-   all catalog files are encoded with samba internal encoding (DOS codepage).
-
-  THIS FUNCTION is ALREADY obsolated and maybe removed soon, -- monyo
-*/
-#define LN_SAMBA_ENCODINGS 3
-static const char* get_samba_enc(const char* penc)
-{
-	int i;
-	static const fstring fdefault = "";
-	static const fstring fmimeenc[LN_SAMBA_ENCODINGS] =
-	{
-		"EUC-JP", "Shift_JIS", "ISO-2022-JP"
-	};
-	static const fstring fsambaenc[LN_SAMBA_ENCODINGS] =
-	{
-		"euc",    "sjis",      "jis"
-	};
-	for(i = 0; i < LN_SAMBA_ENCODINGS; i++)
-	{
-		if(strcasecmp(penc, fmimeenc[i]) == 0)
-			return fsambaenc[i];
-	}
-	return fdefault;
-}
-/* ************************************************************
- find a better language.
- if the language specified by web browser matches to a language
- which is supported by the swat server, this function returns it.
- *********************************************************** */
-static void set_a_language(const char* planguage)
-{
-	/* included gettext source is affected by
-	   these env.variables without locale settings.
-	*/
-	/*
-	   putenv(env) will not duplicate env argument
-	   but smbw_setenv() does this.
-	*/
-        FILE *file;
-	smbw_setenv("LANGUAGE", planguage);
-	smbw_setenv("LANG", planguage);
-	bindtextdomain(I18N_PACKAGE, I18N_LOCALEDIR);
-	textdomain(I18N_PACKAGE);
-}
-static int ln_set_pref_language(LNNegotiator* pLn)
-{
-	int j;
-	pstring enc_name;
-
-	for(j = 0; j < ln_getPreflangCount(pLn); j++)
-	{
-		set_a_language(ln_getPreflang(pLn, j));
-		/* then check for _("") special entry which has
-		   a lot of information about .po file. */
-		if(parse_po_header(_(""), enc_name))
-		{
-			/* the catalog file must exist and may have
-			   encoding information .*/
-			/*
-			  but in this version, catalog files must be
-			  written with samba-internal encoding (i.e.
-			  dos encoding, dos codepage)
-			  so there is no need to convert.
-			  //ln_init_swat_encoding(get_samba_enc(enc_name));
-			  ln_init_swat_encoding(enc_name);
-			*/
-			return j;
-		}
-	}
-	return LN_NO_AVAILABLE_LANG;
-	/* no available or return the default? */
-}
 /* **************************************************************
  initialize gettext. Before this, cgi_setup() should be done. 
  cgi_setup() calls ln_negotiate_language() if the user specifies
-- 
cgit 


From a689b24db14436ab1faa2f2f79b9f27b777b1fdb Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 14 Oct 2001 12:10:29 +0000
Subject: the next step in the intl changeover. This should get us compiling
 agian, and also completes the switch to lang_tdb.c. SWAT should now work with
 a po file in the lib/ directory

also removed useless SYSLOG defines in many files
(This used to be commit 5296b20ad85d7519c870768455cb4d8df048c55a)
---
 source3/web/cgi.c        |  39 +++----
 source3/web/neg_lang.c   | 274 ++++++-----------------------------------------
 source3/web/statuspage.c | 137 ++++++++++++------------
 source3/web/swat.c       |  32 ++----
 4 files changed, 130 insertions(+), 352 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index caba28396f..e1b26d99b4 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "smb.h"
-#include "webintl.h"
 
 #define MAX_VARIABLES 10000
 
@@ -138,7 +137,7 @@ void cgi_load_variables(void)
 #ifdef DEBUG_COMMENTS
 	char dummy[100]="";
 	print_title(dummy);
-	printf("<!== Start dump in cgi_load_variables() %s ==>\n",__FILE__);
+	d_printf("<!== Start dump in cgi_load_variables() %s ==>\n",__FILE__);
 #endif
 
 	if (!content_length) {
@@ -270,7 +269,7 @@ static void cgi_setup_error(char *err, char *header, char *info)
 		}
 	}
 
-	printf("HTTP/1.0 %s\r\n%sConnection: close\r\nContent-Type: text/html\r\n\r\n<HTML><HEAD><TITLE>%s</TITLE></HEAD><BODY><H1>%s</H1>%s<p></BODY></HTML>\r\n\r\n", err, header, err, err, info);
+	d_printf("HTTP/1.0 %s\r\n%sConnection: close\r\nContent-Type: text/html\r\n\r\n<HTML><HEAD><TITLE>%s</TITLE></HEAD><BODY><H1>%s</H1>%s<p></BODY></HTML>\r\n\r\n", err, header, err, err, info);
 	fclose(stdin);
 	fclose(stdout);
 	exit(0);
@@ -448,9 +447,7 @@ static void cgi_download(char *file)
 	char buf[1024];
 	int fd, l, i;
 	char *p;
-#if I18N_SWAT
-	int nLangDesc;
-#endif
+	char *lang;
 
 	/* sanitise the filename */
 	for (i=0;file[i];i++) {
@@ -464,11 +461,8 @@ static void cgi_download(char *file)
 		cgi_setup_error("404 File Not Found","",
 				"The requested file was not found");
 	}
-#if I18N_SWAT
-	fd = sys_open(ln_get_pref_file(file, &st, &nLangDesc),O_RDONLY,0);
-#else
-	fd = sys_open(file,O_RDONLY,0);
-#endif 
+
+	fd = web_open(file,O_RDONLY,0);
 	if (fd == -1) {
 		cgi_setup_error("404 File Not Found","",
 				"The requested file was not found");
@@ -486,10 +480,12 @@ static void cgi_download(char *file)
 		}
 	}
 	printf("Expires: %s\r\n", http_timestring(time(NULL)+EXPIRY_TIME));
-#if I18N_SWAT
-	if(ln_get_lang(nLangDesc))
-		printf("Content-Language: %s\r\n", ln_get_lang(nLangDesc));
-#endif
+
+	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);
 	while ((l=read(fd,buf,sizeof(buf)))>0) {
 		fwrite(buf, 1, l, stdout);
@@ -511,6 +507,7 @@ void cgi_setup(char *rootdir, int auth_required)
 	char line[1024];
 	char *url=NULL;
 	char *p;
+	char *lang;
 
 	if (chdir(rootdir)) {
 		cgi_setup_error("400 Server Error", "",
@@ -520,10 +517,10 @@ void cgi_setup(char *rootdir, int auth_required)
 	/* Handle the possability we might be running as non-root */
 	sec_init();
 
-#if I18N_SWAT
-	if(getenv("HTTP_ACCEPT_LANGUAGE")) /* if running as a cgi program */
-		ln_negotiate_language(getenv("HTTP_ACCEPT_LANGUAGE"));
-#endif
+	if ((lang=getenv("HTTP_ACCEPT_LANGUAGE"))) {
+		/* if running as a cgi program */
+		web_set_lang(lang);
+	}
 
 	/* maybe we are running under a web server */
 	if (getenv("CONTENT_LENGTH") || getenv("REQUEST_METHOD")) {
@@ -559,10 +556,8 @@ void cgi_setup(char *rootdir, int auth_required)
 			authenticated = cgi_handle_authorization(&line[15]);
 		} else if (strncasecmp(line,"Content-Length: ", 16)==0) {
 			content_length = atoi(&line[16]);
-#if I18N_SWAT
 		} else if (strncasecmp(line,"Accept-Language: ", 17)==0) {
-			ln_negotiate_language(&line[17]);
-#endif
+			web_set_lang(&line[17]);
 		}
 		/* ignore all other requests! */
 	}
diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index 32f52aa473..8a5b60d99f 100644
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -1,7 +1,7 @@
 /*
    Unix SMB/Netbios implementation.
-   Version 1.9.
-   Samba Web Administration Tool
+   Version 3.0
+   SWAT language handling
    
    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
@@ -21,251 +21,47 @@
 */
 
 #include "includes.h"
-/* #include "config.h" */
-#include "webintl.h"
 
-#if I18N_SWAT
-/* constants. */
-/* it is ok to make them bigger.*/
-#define LN_PREFLANG_MAX 10
-#define LN_LNAME_LENGTH 8+1+8
-
-#define LN_DEFAULT_LANG I18N_DEFAULT_LANG
-#define LN_LANGDESC_DEFAULT -1
-#define LN_NO_AVAILABLE_LANG -1
-
-/* ******************************************************************
- * macros for debugging.
- ***************************************************************** */
-#ifdef LN_R_NODEBUG
-
-#else
 /*
- *#define LN_DEBUG_LOG "/tmp/lndebug.log"
- *void ln_debug_error(const char *info, int nLine)
- *{
- *	FILE* fp;
- *	fp = sys_fopen(LN_DEBUG_LOG, "a");
- *	fprintf(fp, "%s at %d.\n", info, nLine);
- *	fclose(fp);
- *}
- *void rassert_help(BOOL b, int l)
- *{
- *	if(!b)
- *	{
- *		ln_debug_error("language negotiation error.", l);
- *		exit(1);
- *	}
- *}
- */
-#endif /* LN_R_NODEBUG */
-
-/* ****************************************************************
- LNNegotiator struct. It contains...
- [aPrefLang]
-  the array of strings. each string is the name of
-  languages ("ja", "ko"...), given by web browser.
- [nPrefLang]
-  the number of the languages in aPrefLang.
- [lOriginalLang]
-  == "en": indicates what language the  default(original) files
-  are written with.
-**************************************************************** */
-typedef char lnstring[LN_LNAME_LENGTH + 1];
-#define lnstrcpy(d,s) safe_strcpy((d),(s),sizeof(lnstring)-1)
-
-typedef struct tagLNNegotiator
-{
-	lnstring aPrefLang[LN_PREFLANG_MAX];
-	int nPrefLang;
-	lnstring lOriginalLang;
-}LNNegotiator;
-
-/* **************************************************************
- * some access functions & macros for LNNegotiator struct.
- * ************************************************************ */
-#define ln_getPreflangCount(pLn) ((pLn)->nPrefLang)
-#define ln_getOriginalLang(pLn) ((pLn)->lOriginalLang)
-#define ln_getDefaultPrefLang(pLn) ((pLn)->lDefaultPrefLang)
-
-/* make it inline-expanded (or macro) to get better performance */
-static const char* ln_getPreflang(LNNegotiator* pLn, int i)
-{
-	rassert(i == LN_LANGDESC_DEFAULT
-	       || (0 <= i && i < ln_getPreflangCount(pLn)));
-
-	if(i == LN_LANGDESC_DEFAULT)
-		return NULL;
-	if(0 <= i && i < ln_getPreflangCount(pLn))
-		return pLn->aPrefLang[i];
-	return NULL;
-}
-/* initialize structures */
-static void ln_resetln(LNNegotiator* pLn)
-{
-	pLn->nPrefLang = 0;
-	/* using fixed memory.*/
-}
-static BOOL ln_addPreflang(LNNegotiator* pLn, const char* pLang)
-{
-	int nPref = ln_getPreflangCount(pLn);
-
-	if(nPref >= LN_PREFLANG_MAX)
-		return False;
-
-	lnstrcpy(pLn->aPrefLang[nPref], pLang);
-	(pLn->nPrefLang)++;
-	return True;
-}
-static void ln_initln_help(LNNegotiator* pLn)
-{
-	ln_resetln(pLn);
-	lnstrcpy(pLn->lOriginalLang, I18N_ORIGINAL_LANG);
-	/* I18N_ORIGINAL_LANG = "en" is hardcoded in
-	   webintl.h. */
-	if (I18N_DEFAULT_PREF_LANG[0] != '\0')
-	      ln_addPreflang(pLn, I18N_DEFAULT_PREF_LANG);
-
-	/* this entry is used only when web browser didn't send
-	   ACCEPT-LANGUAGE header. */
-}
-/* ****************************************************************
- * store acceptable languages into LNNegotiator object.
- * [pstrLangarray] The arguments of "accept-language" http header, 
- * which is like "en-GB, es;q=0.5, ja". "q=0.5" is called quality value,
- * but it is ignored now. wiled card "*" is also ignored. 
- ***************************************************************** */
-static BOOL ln_negotiate_language_help( LNNegotiator* pLn, const char* pstrLangarray )
+  during a file download we first check to see if there is a language
+  specific file available. If there is then use that, otherwise 
+  just open the specified file
+*/
+int web_open(const char *fname, int flags, mode_t mode)
 {
-	char* pToken;
-	const char* pDelim = " \n\r\t,;";
-	pstring strBuffer;
-
-	rassert(pstrLangarray);
-	rassert(pLn);
-
-	ln_resetln(pLn);
-	pstrcpy(strBuffer, pstrLangarray);
-	pToken = strtok(strBuffer, pDelim);
-	while(pToken != NULL)
-	{
-		if(strncmp(pToken, "q=", strlen("q=")) == 0)
-		{
-			pToken = strtok(NULL, pDelim);
-			continue;
+	char *p = NULL;
+	char *lang = lang_tdb_current();
+	int fd;
+	if (lang) {
+		asprintf(&p, "lang/%s/%s", lang, fname);
+		if (p) {
+			fd = sys_open(p, flags, mode);
+			free(p);
+			if (fd != -1) {
+				return fd;
+			}
 		}
-		if(!ln_addPreflang(pLn, pToken))
-			break;
-		pToken = strtok(NULL, pDelim);
 	}
-	rassert(ln_getPreflangCount(pLn) != 0);
-	return (ln_getPreflangCount(pLn) != 0);
-}
-
-/* **************************************************************
- initialize gettext. Before this, cgi_setup() should be done. 
- cgi_setup() calls ln_negotiate_language() if the user specifies
- languages in web browser. Then, ln_set_pref_language() will work.
- ************************************************************* */
-static BOOL ln_init_lang_env_help(LNNegotiator* pLn)
-{
-#if I18N_GETTEXT
-	int nLang;
 
-	nLang = ln_set_pref_language(pLn);
-	rstrace(getenv("LANGUAGE"));
-#endif /* I18N_GETTEXT */
-	return True;
+	/* fall through to default name */
+	return sys_open(fname, flags, mode);
 }
-/* *****************************************************************
- * This function searches for the "PrefLang" version of pFile.
- * if not available, returns pFile.
- * [pFile] the filename.
- * [pst] the address of a struct. it will be filled with the information
- *  of the file.
- * [pLangDesc] The address of an integer. a value which indicates the
- * language of the returned value is written to the address. the value
- * is used in ln_get_lang().
- * [return value] address of the name of the language version of the file.
- * It is static object so it will be destroyed at the time ln_get_pref_file()
- * is called.
- **************************************************************** */
-static void ln_make_filename( pstring afname, const char* pFile, const char* pAdd )
-{
-#if LANG_PREFIX
-  /* LANG_PREFIX is already undefined, maybe removed soon */
-	/* maybe, foo.html.ja */
-	pstrcpy(afname, pFile);
-	pstrcat(afname, ".");
-	pstrcat(afname, pAdd);
-#else
-	/* maybe, lang/ja/foo.html */
-	pstrcpy(afname, "lang/");
-	pstrcat(afname, pAdd);
-	pstrcat(afname, "/");
-	pstrcat(afname, pFile);
-#endif
-}
-static const char* ln_get_pref_file_help(
-	LNNegotiator* pLn, const char* pFile,
-	 SMB_STRUCT_STAT* pst, int* pLangDesc)
-{
-	static pstring afname;
-	int i;
 
-	for(i = 0; i < ln_getPreflangCount(pLn); i++)
-	{
-		if(strcmp(ln_getPreflang(pLn, i), ln_getOriginalLang(pLn))
-			  == 0)
-			break;
-		ln_make_filename(afname, pFile, ln_getPreflang(pLn, i));
-		if(file_exist(afname, pst))
-		{
-			*pLangDesc = i;
-			return afname;
-		}
-	}
-	pstrcpy(afname, pFile);
-	file_exist(afname, pst);
-	*pLangDesc = LN_LANGDESC_DEFAULT;
-	return afname;
-}
-/* *******************************************************************
- * file scope variables. this variable is not locked.
- * (not multithread-safe)
- ******************************************************************** */
-static LNNegotiator lnLanguagenegotiator;
 
-/* *******************************************************************
- * interfaces to the outside of this file.
- ******************************************************************** */
-void ln_initln(void)
-{
-	ln_initln_help(&lnLanguagenegotiator);
-}
-BOOL ln_init_lang_env(void)
-{
-	return ln_init_lang_env_help(&lnLanguagenegotiator);
-}
-const char* ln_get_lang(int nLangDesc)
-{
-	return ln_getPreflang(&lnLanguagenegotiator, nLangDesc);
-}
-const char* ln_get_pref_file(const char* pFile,
-			  SMB_STRUCT_STAT* pst, int* pLangDesc)
-{
-	return ln_get_pref_file_help(
-		&lnLanguagenegotiator, pFile, pst, pLangDesc);
-}
-BOOL ln_negotiate_language(const char* pstrLangarray)
-{
-	return ln_negotiate_language_help(
-		&lnLanguagenegotiator, pstrLangarray);
-}
-const char* ln_get_pref_file_n_o(const char* pFile)
+/*
+  choose from a list of languages. The list can be comma or space
+  separated
+  Keep choosing until we get a hit 
+*/
+void web_set_lang(const char *lang_list)
 {
-	SMB_STRUCT_STAT st;
-	int nLangDesc;
-	return ln_get_pref_file(pFile, &st, &nLangDesc);
+	fstring lang;
+	char *p = (char *)lang_list;
+	
+	while (next_token(&p, lang, ", \t\r\n", sizeof(lang))) {
+		if (lang_tdb_init(lang)) return;
+	}
+	
+	/* it's not an error to not initialise - we just fall back to 
+	   the default */
 }
-#endif /* I18N_SWAT */
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index b49fc7b656..6af7674dc9 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "webintl.h"
 
 #define PIDMAP		struct PidMap
 
@@ -40,7 +39,7 @@ static void initPid2Machine (void)
 {
 	/* show machine name rather PID on table "Open Files"? */
 	if (PID_or_Machine) {
-		PIDMAP *p, *q;
+		PIDMAP *p;
 
 		for (p = pidmap; p != NULL; ) {
 			DLIST_REMOVE(pidmap, p);
@@ -105,41 +104,41 @@ static char *tstring(time_t t)
 
 static void print_share_mode(share_mode_entry *e, char *fname)
 {
-	printf("<tr><td>%s</td>",_(mapPid2Machine(e->pid)));
-	printf("<td>");
+	d_printf("<tr><td>%s</td>",_(mapPid2Machine(e->pid)));
+	d_printf("<td>");
 	switch ((e->share_mode>>4)&0xF) {
-	case DENY_NONE: printf(_("DENY_NONE")); break;
-	case DENY_ALL:  printf(_("DENY_ALL   ")); break;
-	case DENY_DOS:  printf(_("DENY_DOS   ")); break;
-	case DENY_READ: printf(_("DENY_READ  ")); break;
-	case DENY_WRITE:printf(_("DENY_WRITE ")); break;
+	case DENY_NONE: d_printf("DENY_NONE"); break;
+	case DENY_ALL:  d_printf("DENY_ALL   "); break;
+	case DENY_DOS:  d_printf("DENY_DOS   "); break;
+	case DENY_READ: d_printf("DENY_READ  "); break;
+	case DENY_WRITE:d_printf("DENY_WRITE "); break;
 	}
-	printf("</td>");
+	d_printf("</td>");
 
-	printf("<td>");
+	d_printf("<td>");
 	switch (e->share_mode&0xF) {
-	case 0: printf(_("RDONLY     ")); break;
-	case 1: printf(_("WRONLY     ")); break;
-	case 2: printf(_("RDWR       ")); break;
+	case 0: d_printf("RDONLY     "); break;
+	case 1: d_printf("WRONLY     "); break;
+	case 2: d_printf("RDWR       "); break;
 	}
-	printf("</td>");
+	d_printf("</td>");
 
-	printf("<td>");
+	d_printf("<td>");
 	if((e->op_type & 
 	    (EXCLUSIVE_OPLOCK|BATCH_OPLOCK)) == 
 	   (EXCLUSIVE_OPLOCK|BATCH_OPLOCK))
-		printf(_("EXCLUSIVE+BATCH "));
+		d_printf("EXCLUSIVE+BATCH ");
 	else if (e->op_type & EXCLUSIVE_OPLOCK)
-		printf(_("EXCLUSIVE       "));
+		d_printf("EXCLUSIVE       ");
 	else if (e->op_type & BATCH_OPLOCK)
-		printf(_("BATCH           "));
+		d_printf("BATCH           ");
 	else if (e->op_type & LEVEL_II_OPLOCK)
-		printf(_("LEVEL_II        "));
+		d_printf("LEVEL_II        ");
 	else
-		printf(_("NONE            "));
-	printf("</td>");
+		d_printf("NONE            ");
+	d_printf("</td>");
 
-	printf("<td>%s</td><td>%s</td></tr>\n",
+	d_printf("<td>%s</td><td>%s</td></tr>\n",
 	       fname,tstring(e->time.tv_sec));
 }
 
@@ -179,15 +178,15 @@ static int traverse_fn2(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 
 	addPid2Machine (crec.pid, crec.machine);
 
-	printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td>\n",
+	d_printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td>\n",
 	       (int)crec.pid,
 	       crec.machine,crec.addr,
 	       tstring(crec.start));
 	if (geteuid() == 0) {
-		printf("<td><input type=submit value=\"X\" name=\"kill_%d\"></td>\n",
+		d_printf("<td><input type=submit value=\"X\" name=\"kill_%d\"></td>\n",
 		       (int)crec.pid);
 	}
-	printf("</tr>\n");
+	d_printf("</tr>\n");
 
 	return 0;
 }
@@ -205,7 +204,7 @@ static int traverse_fn3(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 	if (crec.cnum == -1 || !process_exists(crec.pid))
 		return 0;
 
-	printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td></tr>\n",
+	d_printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td></tr>\n",
 	       crec.name,uidtoname(crec.uid),
 	       gidtoname(crec.gid),(int)crec.pid,
 	       crec.machine,
@@ -270,22 +269,22 @@ void status_page(void)
  
 	initPid2Machine ();
 
-	printf("<H2>%s</H2>\n", _("Server Status"));
+	d_printf("<H2>%s</H2>\n", _("Server Status"));
 
-	printf("<FORM method=post>\n");
+	d_printf("<FORM method=post>\n");
 
 	if (!autorefresh) {
-		printf("<input type=submit value=\"%s\" name=autorefresh>\n", _("Auto Refresh"));
-		printf("<br>%s", _("Refresh Interval: "));
-		printf("<input type=text size=2 name=\"refresh_interval\" value=%d>\n", 
+		d_printf("<input type=submit value=\"%s\" name=autorefresh>\n", _("Auto Refresh"));
+		d_printf("<br>%s", _("Refresh Interval: "));
+		d_printf("<input type=text size=2 name=\"refresh_interval\" value=%d>\n", 
 		       refresh_interval);
 	} else {
-		printf("<input type=submit value=\"%s\" name=norefresh>\n", _("Stop Refreshing"));
-		printf("<br>%s%d\n", _("Refresh Interval: "), refresh_interval);
-		printf("<input type=hidden name=refresh value=1>\n");
+		d_printf("<input type=submit value=\"%s\" name=norefresh>\n", _("Stop Refreshing"));
+		d_printf("<br>%s%d\n", _("Refresh Interval: "), refresh_interval);
+		d_printf("<input type=hidden name=refresh value=1>\n");
 	}
 
-	printf("<p>\n");
+	d_printf("<p>\n");
 
 	if (!tdb) {
 		/* open failure either means no connections have been
@@ -293,83 +292,83 @@ void status_page(void)
 	}
 
 
-	printf("<table>\n");
+	d_printf("<table>\n");
 
-	printf("<tr><td>%s</td><td>%s</td></tr>", _("version:"), VERSION);
+	d_printf("<tr><td>%s</td><td>%s</td></tr>", _("version:"), VERSION);
 
 	fflush(stdout);
-	printf("<tr><td>%s</td><td>%s</td>\n", _("smbd:"), smbd_running()?_("running"):_("not running"));
+	d_printf("<tr><td>%s</td><td>%s</td>\n", _("smbd:"), smbd_running()?_("running"):_("not running"));
 	if (geteuid() == 0) {
 	    if (smbd_running()) {
-		printf("<td><input type=submit name=\"smbd_stop\" value=\"%s\"></td>\n", _("Stop smbd"));
+		d_printf("<td><input type=submit name=\"smbd_stop\" value=\"%s\"></td>\n", _("Stop smbd"));
 	    } else {
-		printf("<td><input type=submit name=\"smbd_start\" value=\"%s\"></td>\n", _("Start smbd"));
+		d_printf("<td><input type=submit name=\"smbd_start\" value=\"%s\"></td>\n", _("Start smbd"));
 	    }
-	    printf("<td><input type=submit name=\"smbd_restart\" value=\"%s\"></td>\n", _("Restart smbd"));
+	    d_printf("<td><input type=submit name=\"smbd_restart\" value=\"%s\"></td>\n", _("Restart smbd"));
 	}
-	printf("</tr>\n");
+	d_printf("</tr>\n");
 
 	fflush(stdout);
-	printf("<tr><td>%s</td><td>%s</td>\n", _("nmbd:"), nmbd_running()?_("running"):_("not running"));
+	d_printf("<tr><td>%s</td><td>%s</td>\n", _("nmbd:"), nmbd_running()?_("running"):_("not running"));
 	if (geteuid() == 0) {
 	    if (nmbd_running()) {
-		printf("<td><input type=submit name=\"nmbd_stop\" value=\"%s\"></td>\n", _("Stop nmbd"));
+		d_printf("<td><input type=submit name=\"nmbd_stop\" value=\"%s\"></td>\n", _("Stop nmbd"));
 	    } else {
-		printf("<td><input type=submit name=\"nmbd_start\" value=\"%s\"></td>\n", _("Start nmbd"));
+		d_printf("<td><input type=submit name=\"nmbd_start\" value=\"%s\"></td>\n", _("Start nmbd"));
 	    }
-	    printf("<td><input type=submit name=\"nmbd_restart\" value=\"%s\"></td>\n", _("Restart nmbd"));
+	    d_printf("<td><input type=submit name=\"nmbd_restart\" value=\"%s\"></td>\n", _("Restart nmbd"));
 	}
-	printf("</tr>\n");
+	d_printf("</tr>\n");
 
-	printf("</table>\n");
+	d_printf("</table>\n");
 	fflush(stdout);
 
-	printf("<p><h3>%s</h3>\n", _("Active Connections"));
-	printf("<table border=1>\n");
-	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th>\n", _("PID"), _("Client"), _("IP address"), _("Date"));
+	d_printf("<p><h3>%s</h3>\n", _("Active Connections"));
+	d_printf("<table border=1>\n");
+	d_printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th>\n", _("PID"), _("Client"), _("IP address"), _("Date"));
 	if (geteuid() == 0) {
-		printf("<th>%s</th>\n", _("Kill"));
+		d_printf("<th>%s</th>\n", _("Kill"));
 	}
-	printf("</tr>\n");
+	d_printf("</tr>\n");
 
 	if (tdb) tdb_traverse(tdb, traverse_fn2, NULL);
 
-	printf("</table><p>\n");
+	d_printf("</table><p>\n");
 
-	printf("<p><h3>%s</h3>\n", _("Active Shares"));
-	printf("<table border=1>\n");
-	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n\n",
+	d_printf("<p><h3>%s</h3>\n", _("Active Shares"));
+	d_printf("<table border=1>\n");
+	d_printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n\n",
 		_("Share"), _("User"), _("Group"), _("PID"), _("Client"), _("Date"));
 
 	if (tdb) tdb_traverse(tdb, traverse_fn3, NULL);
 
-	printf("</table><p>\n");
+	d_printf("</table><p>\n");
 
-	printf("<h3>%s</h3>\n", _("Open Files"));
-	printf("<table border=1>\n");
-	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n", _("PID"), _("Sharing"), _("R/W"), _("Oplock"), _("File"), _("Date"));
+	d_printf("<h3>%s</h3>\n", _("Open Files"));
+	d_printf("<table border=1>\n");
+	d_printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n", _("PID"), _("Sharing"), _("R/W"), _("Oplock"), _("File"), _("Date"));
 
 	locking_init(1);
 	share_mode_forall(print_share_mode);
 	locking_end();
-	printf("</table>\n");
+	d_printf("</table>\n");
 
 	if (tdb) tdb_close(tdb);
 
-	printf("<br><input type=submit name=\"show_client_in_col_1\" value=\"Show Client in col 1\">\n");
-	printf("<input type=submit name=\"show_pid_in_col_1\" value=\"Show PID in col 1\">\n");
+	d_printf("<br><input type=submit name=\"show_client_in_col_1\" value=\"Show Client in col 1\">\n");
+	d_printf("<input type=submit name=\"show_pid_in_col_1\" value=\"Show PID in col 1\">\n");
 
-	printf("</FORM>\n");
+	d_printf("</FORM>\n");
 
 	if (autorefresh) {
 		/* this little JavaScript allows for automatic refresh
                    of the page. There are other methods but this seems
                    to be the best alternative */
-		printf("<script language=\"JavaScript\">\n");
-		printf("<!--\nsetTimeout('window.location.replace(\"%s/status?refresh_interval=%d&refresh=1\")', %d)\n", 
+		d_printf("<script language=\"JavaScript\">\n");
+		d_printf("<!--\nsetTimeout('window.location.replace(\"%s/status?refresh_interval=%d&refresh=1\")', %d)\n", 
 		       cgi_baseurl(),
 		       refresh_interval,
 		       refresh_interval*1000);
-		printf("//-->\n</script>\n");
+		d_printf("//-->\n</script>\n");
 	}
 }
diff --git a/source3/web/swat.c b/source3/web/swat.c
index a6286dc93b..3deaafbc76 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -19,13 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifdef SYSLOG
-#undef SYSLOG
-#endif
-
 #include "includes.h"
-#include "smb.h"
-#include "webintl.h"
 
 #define GLOBALS_SNUM -1
 
@@ -110,24 +104,22 @@ static char *make_parm_name(char *label)
 ****************************************************************************/
 static int include_html(char *fname)
 {
-	FILE *f;
+	int fd;
 	char buf[1024];
 	int ret;
 
-	f = sys_fopen((char*)LN_(fname), "r");
+	fd = web_open(fname, O_RDONLY, 0);
 
-	if (!f) {
-		d_printf(_("ERROR: Can't open %s\n"), fname);
+	if (fd == -1) {
+		d_printf("ERROR: Can't open %s\n", fname);
 		return 0;
 	}
 
-	while (!feof(f)) {
-		ret = fread(buf, 1, sizeof(buf), f);
-		if (ret <= 0) break;
-		fwrite(buf, 1, ret, stdout);
+	while ((ret = read(fd, buf, sizeof(buf))) > 0) {
+		write(1, buf, ret);
 	}
 
-	fclose(f);
+	close(fd);
 	return 1;
 }
 
@@ -475,7 +467,7 @@ static void commit_parameters(int snum)
 /****************************************************************************
   spit out the html for a link with an image 
 ****************************************************************************/
-static void image_link(char *name,char *hlink, char *src)
+static void image_link(const char *name, const char *hlink, const char *src)
 {
 	d_printf("<A HREF=\"%s/%s\"><img border=\"0\" src=\"/swat/%s\" alt=\"%s\"></A>\n", 
 	       cgi_baseurl(), hlink, src, name);
@@ -1045,6 +1037,8 @@ static void printers_page(void)
 	/* just in case it goes wild ... */
 	alarm(300);
 
+	setlinebuf(stdout);
+
 	/* we don't want any SIGPIPE messages */
 	BlockSignals(True,SIGPIPE);
 
@@ -1071,14 +1065,8 @@ static void printers_page(void)
 	iNumNonAutoPrintServices = lp_numservices();
 	load_printers();
 
-#if I18N_SWAT
-	ln_initln();
-	cgi_setup(SWATDIR, !demo_mode);
-	ln_init_lang_env();
-#else
 	cgi_setup(SWATDIR, !demo_mode);
 
-#endif
 	print_header();
 
 	cgi_load_variables();
-- 
cgit 


From a1b9de0b9872b91574e75bb360d49b887a072389 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Mon, 19 Nov 2001 02:48:23 +0000
Subject: Fix const warning.  Doxyfy comment. (This used to be commit
 91e07a7fdc47b2baf42fc06e77d1e1d883111668)

---
 source3/web/cgi.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index e1b26d99b4..9a029684ce 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -497,11 +497,14 @@ static void cgi_download(char *file)
 
 
 
-/***************************************************************************
-setup the cgi framework, handling the possability that this program is either
-run as a true cgi program by a web browser or is itself a mini web server
-  ***************************************************************************/
-void cgi_setup(char *rootdir, int auth_required)
+/**
+ * @brief Setup the CGI framework.
+ *
+ * Setup the cgi framework, handling the possibility that this program
+ * is either run as a true CGI program with a gateway to a web server, or
+ * is itself a mini web server.
+ **/
+void cgi_setup(const char *rootdir, int auth_required)
 {
 	BOOL authenticated = False;
 	char line[1024];
-- 
cgit 


From f741f656737f4ec46cd318e986b6bf412ed309d2 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Mon, 19 Nov 2001 02:49:53 +0000
Subject: Store some path names in global variables initialized to configure
 default, rather than in preprocessor macros. (This used to be commit
 79ec88f0da40faebe1e587f1b3e87b5f2b184f58)

---
 source3/web/startstop.c |  9 +++++----
 source3/web/swat.c      | 37 +++++++++++++++++++++++--------------
 2 files changed, 28 insertions(+), 18 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 9eeac96cc0..80b5ce7444 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -21,11 +21,12 @@
 
 #include "includes.h"
 #include "smb.h"
+#include "dynconfig.h"
 
-/* need to wait for daemons to startup */
+/** Need to wait for daemons to startup */
 #define SLEEP_TIME 3
 
-/* startup smbd */
+/** Startup smbd from web interface. */
 void start_smbd(void)
 {
 	pstring binfile;
@@ -37,7 +38,7 @@ void start_smbd(void)
 		return;
 	}
 
-	slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", SBINDIR);
+	slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", dyn_SBINDIR);
 
 	become_daemon();
 
@@ -58,7 +59,7 @@ void start_nmbd(void)
 		return;
 	}
 
-	slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", SBINDIR);
+	slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", dyn_SBINDIR);
 	
 	become_daemon();
 
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 3deaafbc76..506a6263e9 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1,6 +1,5 @@
 /* 
    Unix SMB/Netbios implementation.
-   Version 1.9.
    Samba Web Administration Tool
    Copyright (C) Andrew Tridgell 1997-1998
    
@@ -19,11 +18,18 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+/**
+ * @group swat SWAT
+ * @{ 
+ * @file swat.c
+ *
+ * @brief Samba Web Administration Tool.
+ **/
+
 #include "includes.h"
 
 #define GLOBALS_SNUM -1
 
-static pstring servicesf = CONFIGFILE;
 static BOOL demo_mode = False;
 static BOOL have_write_access = False;
 static BOOL have_read_access = False;
@@ -370,7 +376,7 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 static BOOL load_config(BOOL save_def)
 {
 	lp_resetnumservices();
-	return lp_load(servicesf,False,save_def,False);
+	return lp_load(dyn_CONFIGFILE,False,save_def,False);
 }
 
 /****************************************************************************
@@ -393,9 +399,9 @@ static int save_reload(int snum)
 	FILE *f;
 	struct stat st;
 
-	f = sys_fopen(servicesf,"w");
+	f = sys_fopen(dyn_CONFIGFILE,"w");
 	if (!f) {
-		d_printf("failed to open %s for writing\n", servicesf);
+		d_printf("failed to open %s for writing\n", dyn_CONFIGFILE);
 		return 0;
 	}
 
@@ -413,7 +419,7 @@ static int save_reload(int snum)
 	lp_killunused(NULL);
 
 	if (!load_config(False)) {
-                d_printf("Can't reload %s\n", servicesf);
+                d_printf("Can't reload %s\n", dyn_CONFIGFILE);
                 return 0;
         }
 	iNumNonAutoPrintServices = lp_numservices();
@@ -1017,9 +1023,10 @@ static void printers_page(void)
 	d_printf("</FORM>\n");
 }
 
-/****************************************************************************
-  MAIN()
-****************************************************************************/
+
+/**
+ * main function for SWAT.
+ **/
  int main(int argc, char *argv[])
 {
 	extern char *optarg;
@@ -1052,7 +1059,7 @@ static void printers_page(void)
 	while ((opt = getopt(argc, argv,"s:a")) != EOF) {
 		switch (opt) {
 		case 's':
-			pstrcpy(servicesf,optarg);
+			pstrcpy(dyn_CONFIGFILE,optarg);
 			break;	  
 		case 'a':
 			demo_mode = True;
@@ -1065,23 +1072,23 @@ static void printers_page(void)
 	iNumNonAutoPrintServices = lp_numservices();
 	load_printers();
 
-	cgi_setup(SWATDIR, !demo_mode);
+	cgi_setup(dyn_SWATDIR, !demo_mode);
 
 	print_header();
 
 	cgi_load_variables();
 
-	if (!file_exist(servicesf, NULL)) {
+	if (!file_exist(dyn_CONFIGFILE, NULL)) {
 		have_read_access = True;
 		have_write_access = True;
 	} else {
 		/* check if the authenticated user has write access - if not then
 		   don't show write options */
-		have_write_access = (access(servicesf,W_OK) == 0);
+		have_write_access = (access(dyn_CONFIGFILE,W_OK) == 0);
 
 		/* if the user doesn't have read access to smb.conf then
 		   don't let them view it */
-		have_read_access = (access(servicesf,R_OK) == 0);
+		have_read_access = (access(dyn_CONFIGFILE,R_OK) == 0);
 	}
 
 	show_main_buttons();
@@ -1108,3 +1115,5 @@ static void printers_page(void)
 	print_footer();
 	return 0;
 }
+
+/** @} **/
-- 
cgit 


From c311d24ce32d2a8aa244f126bcec67ec03549727 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 17 Jan 2002 08:45:58 +0000
Subject: A nice *big* change to the fundemental way we do things.

Samba (ab)uses the returns from getpwnam() a lot - in particular it keeps
them around for a long time - often past the next call...

This adds a getpwnam_alloc and a getpwuid_alloc to the collection.

These function as expected, returning a malloced structure that can be
free()ed with passwd_free(&passwd).

This patch also cuts down on the number of calls to getpwnam - mostly by
taking advantage of the fact that the passdb interface is already
case-insensiteve.

With this patch most of the recursive cases have been removed (that I know
of) and the problems are reduced further by not using the sys_ interface
in the new code.  This means that pointers to the cache won't be affected.
(This is a tempoary HACK, I intend to kill the password cache entirly).

The only change I'm a little worried about is the change to
rpc_server/srv_samr_nt.c for private groups.  In this case we are getting
groups from the new group mapping DB.  Do we still need to check for private
groups?  I've toned down the check to a case sensitve match with the new code,
but we might be able to kill it entirly.

I've also added a make_modifyable_passwd() function, that copies a passwd
struct into the form that the old sys_getpw* code provided.  As far as I can
tell this is only actually used in the pass_check.c crazies, where I moved
the final 'special case' for shadow passwords (out of _Get_Pwnam()).

The matching case for getpwent() is dealt with already, in lib/util_getent.c

Also included in here is a small change to register the [homes] share at vuid
creation rather than just in one varient of the session setup.  (This picks
up the SPNEGO cases).  The home directory is now stored on the vuid, and I
am hoping this might provide a saner way to do %H substitions.

TODO:  Kill off remaining Get_Pwnam_Modify calls (they are not needed), change
the remaining sys_getpwnam() callers to use getpwnam_alloc() and move
Get_Pwnam to return an allocated struct.

Andrew Bartlett
(This used to be commit 1d86c7f94230bc53daebd4d2cd829da6292e05da)
---
 source3/web/cgi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 9a029684ce..a8cb543dfb 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -388,7 +388,7 @@ static BOOL cgi_handle_authorization(char *line)
 	 * Try and get the user from the UNIX password file.
 	 */
 	
-	pass = sys_getpwnam(user);
+	pass = getpwnam_alloc(user);
 	
 	/*
 	 * Validate the password they have given.
@@ -406,6 +406,7 @@ static BOOL cgi_handle_authorization(char *line)
 			
 			/* Save the users name */
 			C_user = strdup(user);
+			passwd_free(&pass);
 			return True;
 		}
 	}
@@ -414,6 +415,7 @@ err:
 	cgi_setup_error("401 Bad Authorization", "", 
 			"username or password incorrect");
 
+	passwd_free(&pass);
 	return False;
 }
 
-- 
cgit 


From e1793bde612c499d08c6ecb9fdecb630a9cdf04d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 21 Jan 2002 00:47:02 +0000
Subject: getpwnam -> getpwnam_alloc (This used to be commit
 f8208458b3ac05743932d96e4d0a919adc0d9e55)

---
 source3/web/cgi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index a8cb543dfb..e785ce92d8 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -312,7 +312,7 @@ static void cgi_web_auth(void)
 		exit(0);
 	}
 
-	pwd = getpwnam(user);
+	pwd = getpwnam_alloc(user);
 	if (!pwd) {
 		printf("%sCannot find user %s<br>%s\n", head, user, tail);
 		exit(0);
@@ -325,6 +325,7 @@ static void cgi_web_auth(void)
 		       head, user, (int)geteuid(), (int)getuid(), tail);
 		exit(0);
 	}
+	passwd_free(&pwd);
 }
 
 /***************************************************************************
-- 
cgit 


From cd68afe31256ad60748b34f7318a180cfc2127cc Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 30 Jan 2002 06:08:46 +0000
Subject: Removed version number from file header.

Changed "SMB/Netbios" to "SMB/CIFS" in file header.
(This used to be commit 6a58c9bd06d0d7502a24bf5ce5a2faf0a146edfa)
---
 source3/web/diagnose.c   | 3 +--
 source3/web/neg_lang.c   | 3 +--
 source3/web/startstop.c  | 3 +--
 source3/web/statuspage.c | 3 +--
 source3/web/swat.c       | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index bf2e6da17d..73c23ea2bb 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -1,6 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 1.9.
+   Unix SMB/CIFS implementation.
    diagnosis tools for web admin
    Copyright (C) Andrew Tridgell 1998
    
diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index 8a5b60d99f..fc115bfd61 100644
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -1,6 +1,5 @@
 /*
-   Unix SMB/Netbios implementation.
-   Version 3.0
+   Unix SMB/CIFS implementation.
    SWAT language handling
    
    This program is free software; you can redistribute it and/or modify
diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 80b5ce7444..27ee7dd96e 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -1,6 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 1.9.
+   Unix SMB/CIFS implementation.
    start/stop nmbd and smbd
    Copyright (C) Andrew Tridgell 1998
    
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 6af7674dc9..62158a5f32 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -1,6 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 2.2.
+   Unix SMB/CIFS implementation.
    web status page
    Copyright (C) Andrew Tridgell 1997-1998
    
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 506a6263e9..955cbb0748 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1,5 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
+   Unix SMB/CIFS implementation.
    Samba Web Administration Tool
    Copyright (C) Andrew Tridgell 1997-1998
    
-- 
cgit 


From 75722fa183d1678bc7360bc79f9ac8cf17cd62e3 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Wed, 20 Mar 2002 06:57:03 +0000
Subject: Add assertions that kill() is never accidentally passed a
 non-positive pid.  This follows a bug in rsync where it would accidentally
 kill(-1), removing all the user's processes.  I can't see any way this would
 directly happen in Samba, but having the assertions seems beneficial.

http://cvs.samba.org/cgi-bin/cvsweb/rsync/util.c.diff?r1=1.108&r2=1.109&f=h
(This used to be commit 098905bea29c7d5b886809d431294ddf2fc1e152)
---
 source3/web/startstop.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 27ee7dd96e..c56320c962 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -75,7 +75,7 @@ void stop_smbd(void)
 
 	if (geteuid() != 0) return;
 
-	if (pid == 0) return;
+	if (pid <= 0) return;
 
 	kill(pid, SIGTERM);
 }
@@ -87,7 +87,7 @@ void stop_nmbd(void)
 
 	if (geteuid() != 0) return;
 
-	if (pid == 0) return;
+	if (pid <= 0) return;
 
 	kill(pid, SIGTERM);
 }
-- 
cgit 


From e90b65284812aaa5ff9e9935ce9bbad7791cbbcd Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 15 Jul 2002 10:35:28 +0000
Subject: updated the 3.0 branch from the head branch - ready for alpha18 (This
 used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)

---
 source3/web/.cvsignore   | 1 +
 source3/web/cgi.c        | 2 +-
 source3/web/diagnose.c   | 6 +++---
 source3/web/neg_lang.c   | 1 +
 source3/web/startstop.c  | 2 +-
 source3/web/statuspage.c | 1 +
 source3/web/swat.c       | 3 ++-
 7 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/.cvsignore b/source3/web/.cvsignore
index e69de29bb2..ed29eafc6b 100644
--- a/source3/web/.cvsignore
+++ b/source3/web/.cvsignore
@@ -0,0 +1 @@
+swat_proto.h
\ No newline at end of file
diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index e785ce92d8..7415fbe3f1 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -19,7 +19,7 @@
 
 
 #include "includes.h"
-#include "smb.h"
+#include "../web/swat_proto.h"
 
 #define MAX_VARIABLES 10000
 
diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index 73c23ea2bb..e822474aab 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "smb.h"
+#include "../web/swat_proto.h"
 
 
 /* check to see if nmbd is running on localhost by looking for a __SAMBA__
@@ -27,14 +27,14 @@
 BOOL nmbd_running(void)
 {
 	extern struct in_addr loopback_ip;
-	int fd, count;
+	int fd, count, flags;
 	struct in_addr *ip_list;
 
 	if ((fd = open_socket_in(SOCK_DGRAM, 0, 3,
 				 interpret_addr("127.0.0.1"), True)) != -1) {
 		if ((ip_list = name_query(fd, "__SAMBA__", 0, 
 					  True, True, loopback_ip,
-					  &count)) != NULL) {
+					  &count, &flags, NULL)) != NULL) {
 			SAFE_FREE(ip_list);
 			close(fd);
 			return True;
diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index fc115bfd61..88bc5498e9 100644
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "../web/swat_proto.h"
 
 /*
   during a file download we first check to see if there is a language
diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index c56320c962..893784dd55 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "smb.h"
+#include "../web/swat_proto.h"
 #include "dynconfig.h"
 
 /** Need to wait for daemons to startup */
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 62158a5f32..792e077a61 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "../web/swat_proto.h"
 
 #define PIDMAP		struct PidMap
 
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 955cbb0748..7be46790db 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -27,6 +27,7 @@
  **/
 
 #include "includes.h"
+#include "../web/swat_proto.h"
 
 #define GLOBALS_SNUM -1
 
@@ -329,7 +330,7 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 					break;
 
 				case P_LIST:
-					if (!lp_list_compare(*(char ***)ptr, (char **)(parm->def.lvalue))) continue;
+					if (!str_list_compare(*(char ***)ptr, (char **)(parm->def.lvalue))) continue;
 					break;
 
 				case P_STRING:
-- 
cgit 


From fcbb06414d2c8385ce4e68f23905a528c8fbd4e8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 17 Aug 2002 14:34:48 +0000
Subject: sync 3.0 branch with HEAD (This used to be commit
 d53d77cc8e21dfbfd376d529661ef299e14e31a0)

---
 source3/web/diagnose.c   | 17 +++++++++++++
 source3/web/neg_lang.c   | 62 +++++++++++++++++++++++++++++++++++++++++++-----
 source3/web/startstop.c  | 33 ++++++++++++++++++++++++++
 source3/web/statuspage.c | 28 ++++++++++++++++++++++
 source3/web/swat.c       | 16 ++++++-------
 5 files changed, 142 insertions(+), 14 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index e822474aab..396499bcb9 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -21,6 +21,23 @@
 #include "includes.h"
 #include "../web/swat_proto.h"
 
+#ifdef WITH_WINBIND
+
+NSS_STATUS winbindd_request(int req_type,
+			struct winbindd_request *request,
+			struct winbindd_response *response);
+
+/* check to see if winbind is running by pinging it */
+
+BOOL winbindd_running(void)
+{
+
+	if (winbindd_request(WINBINDD_PING, NULL, NULL))
+		return False;
+
+	return True;
+}	
+#endif
 
 /* check to see if nmbd is running on localhost by looking for a __SAMBA__
    response */
diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index 88bc5498e9..da974f78a4 100644
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -48,20 +48,70 @@ int web_open(const char *fname, int flags, mode_t mode)
 }
 
 
+struct pri_list {
+	float pri;
+	char *string;
+};
+
+static int qsort_cmp_list(const void *x, const void *y) {
+	struct pri_list *a = (struct pri_list *)x;
+	struct pri_list *b = (struct pri_list *)y;
+	if (a->pri > b->pri) return -1;
+	if (a->pri == b->pri) return 0;
+	return 1;
+}
+
 /*
   choose from a list of languages. The list can be comma or space
   separated
   Keep choosing until we get a hit 
+  Changed to habdle priority -- Simo
 */
-void web_set_lang(const char *lang_list)
+
+void web_set_lang(const char *lang_string)
 {
-	fstring lang;
-	char *p = (char *)lang_list;
+	char **lang_list, **count;
+	struct pri_list *pl;
+	int lang_num, i;
+
+	/* build the lang list */
+	lang_list = str_list_make(lang_string, ", \t\r\n");
+	if (!lang_list) return;
 	
-	while (next_token(&p, lang, ", \t\r\n", sizeof(lang))) {
-		if (lang_tdb_init(lang)) return;
+	/* sort the list by priority */
+	lang_num = 0;
+	count = lang_list;
+	while (*count && **count) {
+		count++;
+		lang_num++;
 	}
-	
+	pl = (struct pri_list *)malloc(sizeof(struct pri_list) * lang_num);
+	for (i = 0; i < lang_num; i++) {
+		char *pri_code;
+		if ((pri_code=strstr(lang_list[i], ";q="))) {
+			*pri_code = '\0';
+			pri_code += 3;
+			sscanf(pri_code, "%f", &(pl[i].pri));
+		} else {
+			pl[i].pri = 1;
+		}
+		pl[i].string = strdup(lang_list[i]);
+	}
+	str_list_free(&lang_list);
+
+	qsort(pl, lang_num, sizeof(struct pri_list), &qsort_cmp_list);
+
 	/* it's not an error to not initialise - we just fall back to 
 	   the default */
+
+	for (i = 0; i < lang_num; i++) {
+		if (lang_tdb_init(pl[i].string)) break;
+	}
+
+	for (i = 0; i < lang_num; i++) {
+		SAFE_FREE(pl[i].string);
+	}
+	SAFE_FREE(pl);
+
+	return;
 }
diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 893784dd55..e10dff4118 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -67,6 +67,27 @@ void start_nmbd(void)
 	exit(0);
 }
 
+/** Startup winbindd from web interface. */
+void start_winbindd(void)
+{
+	pstring binfile;
+
+	if (geteuid() != 0) return;
+
+	if (fork()) {
+		sleep(SLEEP_TIME);
+		return;
+	}
+
+	slprintf(binfile, sizeof(pstring) - 1, "%s/winbindd", dyn_SBINDIR);
+
+	become_daemon();
+
+	execl(binfile, binfile, NULL);
+
+	exit(0);
+}
+
 
 /* stop smbd */
 void stop_smbd(void)
@@ -91,7 +112,19 @@ void stop_nmbd(void)
 
 	kill(pid, SIGTERM);
 }
+#ifdef WITH_WINBIND
+/* stop winbindd */
+void stop_winbindd(void)
+{
+	pid_t pid = pidfile_pid("winbindd");
 
+	if (geteuid() != 0) return;
+
+	if (pid <= 0) return;
+
+	kill(pid, SIGTERM);
+}
+#endif
 /* kill a specified process */
 void kill_pid(pid_t pid)
 {
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 792e077a61..3b597d44c0 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -248,6 +248,20 @@ void status_page(void)
 		stop_nmbd();
 	}
 
+#ifdef WITH_WINBIND
+	if (cgi_variable("winbindd_restart")) {
+		stop_winbindd();
+		start_winbindd();
+	}
+
+	if (cgi_variable("winbindd_start")) {
+		start_winbindd();
+	}
+
+	if (cgi_variable("winbindd_stop")) {
+		stop_winbindd();
+	}
+#endif
 	if (cgi_variable("autorefresh")) {
 		autorefresh = 1;
 	} else if (cgi_variable("norefresh")) {
@@ -320,6 +334,20 @@ void status_page(void)
 	}
 	d_printf("</tr>\n");
 
+#ifdef WITH_WINBIND
+	fflush(stdout);
+	d_printf("<tr><td>%s</td><td>%s</td>\n", _("winbindd:"), winbindd_running()?_("running"):_("not running"));
+	if (geteuid() == 0) {
+	    if (winbindd_running()) {
+		d_printf("<td><input type=submit name=\"winbindd_stop\" value=\"%s\"></td>\n", _("Stop winbindd"));
+	    } else {
+		d_printf("<td><input type=submit name=\"winbindd_start\" value=\"%s\"></td>\n", _("Start winbindd"));
+	    }
+	    d_printf("<td><input type=submit name=\"winbindd_restart\" value=\"%s\"></td>\n", _("Restart winbindd"));
+	}
+	d_printf("</tr>\n");
+#endif
+
 	d_printf("</table>\n");
 	fflush(stdout);
 
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 7be46790db..80d3232d2b 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -79,15 +79,15 @@ static char *fix_backslash(char *str)
 	return newstring;
 }
 
-static char *stripspace(char *str)
+static char *stripspaceupper(char *str)
 {
-static char newstring[1024];
-char *p = newstring;
+	static char newstring[1024];
+	char *p = newstring;
 
-        while (*str) {
-                if (*str != ' ') *p++ = *str;
-                ++str;
-        }
+	while (*str) {
+		if (*str != ' ') *p++ = toupper(*str);
+		++str;
+	}
 	*p = '\0';
 	return newstring;
 }
@@ -200,7 +200,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		ptr = lp_local_ptr(snum, ptr);
 	}
 
-	printf("<tr><td>%s</td><td>", get_parm_translated(stripspace(parm->label), _("Help"), parm->label));
+	printf("<tr><td>%s</td><td>", get_parm_translated(stripspaceupper(parm->label), _("Help"), parm->label));
 	switch (parm->type) {
 	case P_CHAR:
 		d_printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",
-- 
cgit 


From a834a73e341059be154426390304a42e4a011f72 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 25 Sep 2002 15:19:00 +0000
Subject: sync'ing up for 3.0alpha20 release (This used to be commit
 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)

---
 source3/web/swat.c | 343 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 290 insertions(+), 53 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 80d3232d2b..af6fa82ffe 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1,7 +1,9 @@
 /* 
    Unix SMB/CIFS implementation.
    Samba Web Administration Tool
-   Copyright (C) Andrew Tridgell 1997-1998
+   Version 3.0.0
+   Copyright (C) Andrew Tridgell 1997-2002
+   Copyright (C) John H Terpstra 2002
    
    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
@@ -297,7 +299,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 /****************************************************************************
   display a set of parameters for a service 
 ****************************************************************************/
-static void show_parameters(int snum, int allparameters, int advanced, int printers)
+static void show_parameters(int snum, int allparameters, unsigned int parm_filter, int printers)
 {
 	int i = 0;
 	struct parm_struct *parm;
@@ -316,7 +318,7 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 			if (printers & !(parm->flags & FLAG_PRINT)) continue;
 			if (!printers & !(parm->flags & FLAG_SHARE)) continue;
 		}
-		if (!advanced) {
+		if (parm_filter == FLAG_BASIC) {
 			if (!(parm->flags & FLAG_BASIC)) {
 				void *ptr = parm->ptr;
 
@@ -363,6 +365,12 @@ static void show_parameters(int snum, int allparameters, int advanced, int print
 			}
 			if (printers && !(parm->flags & FLAG_PRINT)) continue;
 		}
+		if (parm_filter == FLAG_WIZARD) {
+			if (!((parm->flags & FLAG_WIZARD))) continue;
+		}
+		if (parm_filter == FLAG_ADVANCED) {
+			if (!((parm->flags & FLAG_ADVANCED))) continue;
+		}
 		if (heading && heading != last_heading) {
 			d_printf("<tr><td></td></tr><tr><td><b><u>%s</u></b></td></tr>\n", _(heading));
 			last_heading = heading;
@@ -393,7 +401,7 @@ static void write_config(FILE *f, BOOL show_defaults)
 }
 
 /****************************************************************************
-  save and reoad the smb.conf config file 
+  save and reload the smb.conf config file 
 ****************************************************************************/
 static int save_reload(int snum)
 {
@@ -497,6 +505,7 @@ static void show_main_buttons(void)
 		image_link(_("Globals"), "globals", "images/globals.gif");
 		image_link(_("Shares"), "shares", "images/shares.gif");
 		image_link(_("Printers"), "printers", "images/printers.gif");
+		image_link(_("Wizard"), "wizard", "images/wizard.gif");
 	}
 	if (have_read_access) {
 		image_link(_("Status"), "status", "images/status.gif");
@@ -507,6 +516,18 @@ static void show_main_buttons(void)
 	d_printf("<HR>\n");
 }
 
+/****************************************************************************
+ * Handle Display/Edit Mode CGI
+ ****************************************************************************/
+static void ViewModeBoxes(int mode)
+{
+	d_printf("<p>%s\n", _("Configuration View:&nbsp"));
+	d_printf("<input type=radio name=\"ViewMode\" value=0 %s>Basic\n", (mode == 0) ? "checked" : "");
+	d_printf("<input type=radio name=\"ViewMode\" value=1 %s>Advanced\n", (mode == 1) ? "checked" : "");
+	d_printf("<input type=radio name=\"ViewMode\" value=2 %s>Developer\n", (mode == 2) ? "checked" : "");
+	d_printf("</p><br>\n");
+}
+
 /****************************************************************************
   display a welcome page  
 ****************************************************************************/
@@ -541,25 +562,240 @@ static void viewconfig_page(void)
 	d_printf("</form>\n");
 }
 
+/****************************************************************************
+  second screen of the wizard ... Fetch Configuration Parameters
+****************************************************************************/
+static void wizard_params_page(void)
+{
+	unsigned int parm_filter = FLAG_WIZARD;
+
+	/* Here we first set and commit all the parameters that were selected
+ 	   in the previous screen. */
+
+	d_printf("<H2>Wizard Parameter Edit Page</H2>\n");
+
+	if (cgi_variable("Commit")) {
+		commit_parameters(GLOBALS_SNUM);
+		save_reload(0);
+	}
+
+	d_printf("<form name=\"swatform\" method=post action=wizard_params>\n");
+
+	if (have_write_access) {
+		d_printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+	}
+
+	d_printf("<input type=reset name=\"Reset Values\" value=\"Reset\">\n");
+	d_printf("<p>\n");
+	
+	d_printf("<table>\n");
+	show_parameters(GLOBALS_SNUM, 1, parm_filter, 0);
+	d_printf("</table>\n");
+	d_printf("</form>\n");
+}
+
+/****************************************************************************
+  Utility to just rewrite the smb.conf file - effectively just cleans it up
+****************************************************************************/
+static void rewritecfg_file(void)
+{
+	commit_parameters(GLOBALS_SNUM);
+	save_reload(0);
+	d_printf("<H2>Note: smb.conf %s</H2>\n", _("file has been read and rewritten"));
+}
+
+/****************************************************************************
+  wizard to create/modify the smb.conf file
+****************************************************************************/
+static void wizard_page(void)
+{
+	/* Set some variables to collect data from smb.conf */
+	int role = 0;
+	int winstype = 0;
+	int have_home = -1;
+	int HomeExpo = 0;
+	int SerType = 0;
+
+	if (cgi_variable("Rewrite")) {
+		(void) rewritecfg_file();
+		return;
+	}
+
+	if (cgi_variable("GetWizardParams")){
+		(void) wizard_params_page();
+		return;
+	}
+
+	if (cgi_variable("Commit")){
+		SerType = atoi(cgi_variable("ServerType"));
+		winstype = atoi(cgi_variable("WINSType"));
+		have_home = lp_servicenumber(HOMES_NAME);
+		HomeExpo = atoi(cgi_variable("HomeExpo"));
+
+		/* Plain text passwords are too badly broken - use encrypted passwords only */
+		lp_do_parameter( GLOBALS_SNUM, "encrypt passwords", "Yes");
+		
+		switch ( SerType ){
+			case 0:
+				/* Stand-alone Server */
+				lp_do_parameter( GLOBALS_SNUM, "security", "USER" );
+				lp_do_parameter( GLOBALS_SNUM, "domain logons", "No" );
+				break;
+			case 1:
+				/* Domain Member */
+				lp_do_parameter( GLOBALS_SNUM, "security", "DOMAIN" );
+				lp_do_parameter( GLOBALS_SNUM, "domain logons", "No" );
+				break;
+			case 2:
+				/* Domain Controller */
+				lp_do_parameter( GLOBALS_SNUM, "security", "USER" );
+				lp_do_parameter( GLOBALS_SNUM, "domain logons", "Yes" );
+				break;
+		}
+		switch ( winstype ) {
+			case 0:
+				lp_do_parameter( GLOBALS_SNUM, "wins support", "No" );
+				lp_do_parameter( GLOBALS_SNUM, "wins server", "" );
+				break;
+			case 1:
+				lp_do_parameter( GLOBALS_SNUM, "wins support", "Yes" );
+				lp_do_parameter( GLOBALS_SNUM, "wins server", "" );
+				break;
+			case 2:
+				lp_do_parameter( GLOBALS_SNUM, "wins support", "No" );
+				lp_do_parameter( GLOBALS_SNUM, "wins server", cgi_variable("WINSAddr"));
+				break;
+		}
+
+		/* Have to create Homes share? */
+		if ((HomeExpo == 1) && (have_home == -1)) {
+			pstring unix_share;
+			
+			pstrcpy(unix_share,HOMES_NAME);
+			load_config(False);
+			lp_copy_service(GLOBALS_SNUM, unix_share);
+			iNumNonAutoPrintServices = lp_numservices();
+			have_home = lp_servicenumber(HOMES_NAME);
+			lp_do_parameter( have_home, "read only", "No");
+			lp_do_parameter( have_home, "valid users", "%S");
+			lp_do_parameter( have_home, "browseable", "No");
+			commit_parameters(have_home);
+		}
+
+		/* Need to Delete Homes share? */
+		if ((HomeExpo == 0) && (have_home != -1)) {
+			lp_remove_service(have_home);
+			have_home = -1;
+		}
+
+		commit_parameters(GLOBALS_SNUM);
+		save_reload(0);
+	}
+	else
+	{
+		/* Now determine smb.conf WINS settings */
+		if (lp_wins_support())
+			winstype = 1;
+/*		if (strlen(lp_wins_server_list()) != 0 )
+ *		winstype = 2;
+ */		
+
+		/* Do we have a homes share? */
+		have_home = lp_servicenumber(HOMES_NAME);
+	}
+	if ((winstype == 2) && lp_wins_support())
+		winstype = 3;
+
+	role = lp_server_role();
+	
+	/* Here we go ... */
+	d_printf("<H2>Samba Configuration Wizard</H2>\n");
+	d_printf("<form method=post action=wizard>\n");
+
+	if (have_write_access) {
+		d_printf(_("The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments.\n"));
+		d_printf(_("The same will happen if you press the commit button."));
+		d_printf("<br><br>");
+		d_printf("<center>");
+		d_printf("<input type=submit name=\"Rewrite\" value=%s> &nbsp;&nbsp;",_("Rewrite smb.conf file"));
+		d_printf("<input type=submit name=\"Commit\" value=%s> &nbsp;&nbsp;",_("Commit"));
+		d_printf("<input type=submit name=\"GetWizardParams\" value=%s>", _("Edit Parameter Values"));
+		d_printf("</center>");
+	}
+
+	d_printf("<hr>");
+	d_printf("<center><table border=0>");
+	d_printf("<tr><td><b>%s</b></td>\n", "Server Type:&nbsp;");
+	d_printf("<td><input type=radio name=\"ServerType\" value=0 %s> Stand Alone&nbsp;</td>", (role == ROLE_STANDALONE) ? "checked" : "");
+	d_printf("<td><input type=radio name=\"ServerType\" value=1 %s> Domain Member&nbsp;</td>", (role == ROLE_DOMAIN_MEMBER) ? "checked" : ""); 
+	d_printf("<td><input type=radio name=\"ServerType\" value=2 %s> Domain Controller&nbsp;</td>", (role == ROLE_DOMAIN_PDC) ? "checked" : "");
+	d_printf("</tr>");
+	if (role == ROLE_DOMAIN_BDC) {
+		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Unusual Type in smb.conf - Please Select New Mode</font></td></tr>");
+	}
+	d_printf("<tr><td><b>%s</b></td>\n", "Configure WINS As:&nbsp;");
+	d_printf("<td><input type=radio name=\"WINSType\" value=0 %s> Not Used&nbsp;</td>", (winstype == 0) ? "checked" : "");
+	d_printf("<td><input type=radio name=\"WINSType\" value=1 %s> Server for client use&nbsp;</td>", (winstype == 1) ? "checked" : "");
+	d_printf("<td><input type=radio name=\"WINSType\" value=2 %s> Client of another WINS server&nbsp;</td>", (winstype == 2) ? "checked" : "");
+	d_printf("<tr><td></td><td></td><td></td><td>Remote WINS Server&nbsp;<input type=text size=\"16\" name=\"WINSAddr\" value=\"%s\"></td></tr>",lp_wins_server_list());
+	if (winstype == 3) {
+		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Error: WINS Server Mode and WINS Support both set in smb.conf</font></td></tr>");
+		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Please Select desired WINS mode above.</font></td></tr>");
+	}
+	d_printf("</tr>");
+	d_printf("<tr><td><b>%s</b></td>\n","Expose Home Directories:&nbsp;");
+	d_printf("<td><input type=radio name=\"HomeExpo\" value=1 %s> Yes</td>", (have_home == -1) ? "" : "checked ");
+	d_printf("<td><input type=radio name=\"HomeExpo\" value=0 %s> No</td>", (have_home == -1 ) ? "checked" : "");
+	d_printf("<td></td></tr>");
+	
+	/* Enable this when we are ready ....
+	 * d_printf("<tr><td><b>%s</b></td>\n","Is Print Server:&nbsp;");
+	 * d_printf("<td><input type=radio name=\"PtrSvr\" value=1 %s> Yes</td>");
+	 * d_printf("<td><input type=radio name=\"PtrSvr\" value=0 %s> No</td>");
+	 * d_printf("<td></td></tr>");
+	 */
+	
+	d_printf("</table></center>");
+	d_printf("<hr>");
+
+	d_printf(_("The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment.\n"));
+	d_printf("</form>\n");
+}
+
+
 /****************************************************************************
   display a globals editing page  
 ****************************************************************************/
 static void globals_page(void)
 {
-	int advanced = 0;
+	unsigned int parm_filter = FLAG_BASIC;
+	int mode = 0;
 
 	d_printf("<H2>%s</H2>\n", _("Global Variables"));
 
-	if (cgi_variable("Advanced") && !cgi_variable("Basic"))
-		advanced = 1;
-
 	if (cgi_variable("Commit")) {
 		commit_parameters(GLOBALS_SNUM);
 		save_reload(0);
 	}
 
-	d_printf("<FORM name=\"swatform\" method=post>\n");
-
+	if ( cgi_variable("ViewMode") )
+		mode = atoi(cgi_variable("ViewMode"));
+
+	d_printf("<form name=\"swatform\" method=post action=globals>\n");
+
+	ViewModeBoxes( mode );
+	switch ( mode ) {
+		case 0:
+			parm_filter = FLAG_BASIC;
+			break;
+		case 1:
+			parm_filter = FLAG_ADVANCED;
+			break;
+		case 2:
+			parm_filter = FLAG_DEVELOPER;
+			break;
+	}
+	d_printf("<br>\n");
 	if (have_write_access) {
 		d_printf("<input type=submit name=\"Commit\" value=\"%s\">\n",
 			_("Commit Changes"));
@@ -567,22 +803,12 @@ static void globals_page(void)
 
 	d_printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", 
 		 _("Reset Values"));
-	if (advanced == 0) {
-		d_printf("<input type=submit name=\"Advanced\" value=\"%s\">\n", _("Advanced View"));
-	} else {
-		d_printf("<input type=submit name=\"Basic\" value=\"%s\">\n", _("Basic View"));
-	}
+
 	d_printf("<p>\n");
-	
 	d_printf("<table>\n");
-	show_parameters(GLOBALS_SNUM, 1, advanced, 0);
+	show_parameters(GLOBALS_SNUM, 1, parm_filter, 0);
 	d_printf("</table>\n");
-
-	if (advanced) {
-		d_printf("<input type=hidden name=\"Advanced\" value=1>\n");
-	}
-
-	d_printf("</FORM>\n");
+	d_printf("</form>\n");
 }
 
 /****************************************************************************
@@ -595,16 +821,14 @@ static void shares_page(void)
 	char *s;
 	int snum = -1;
 	int i;
-	int advanced = 0;
+	int mode = 0;
+	unsigned int parm_filter = FLAG_BASIC;
 
 	if (share)
 		snum = lp_servicenumber(share);
 
 	d_printf("<H2>%s</H2>\n", _("Share Parameters"));
 
-	if (cgi_variable("Advanced") && !cgi_variable("Basic"))
-		advanced = 1;
-
 	if (cgi_variable("Commit") && snum >= 0) {
 		commit_parameters(snum);
 		save_reload(0);
@@ -628,7 +852,21 @@ static void shares_page(void)
 	d_printf("<FORM name=\"swatform\" method=post>\n");
 
 	d_printf("<table>\n");
-	d_printf("<tr>\n");
+	if ( cgi_variable("ViewMode") )
+		mode = atoi(cgi_variable("ViewMode"));
+	ViewModeBoxes( mode );
+	switch ( mode ) {
+		case 0:
+			parm_filter = FLAG_BASIC;
+			break;
+		case 1:
+			parm_filter = FLAG_ADVANCED;
+			break;
+		case 2:
+			parm_filter = FLAG_DEVELOPER;
+			break;
+	}
+	d_printf("<br><tr>\n");
 	d_printf("<td><input type=submit name=selectshare value=\"%s\"></td>\n", _("Choose Share"));
 	d_printf("<td><select name=share>\n");
 	if (snum < 0)
@@ -662,24 +900,15 @@ static void shares_page(void)
 		}
 
 		d_printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", _("Reset Values"));
-		if (advanced == 0) {
-			d_printf("<input type=submit name=\"Advanced\" value=\"%s\">\n", _("Advanced View"));
-		} else {
-			d_printf("<input type=submit name=\"Basic\" value=\"%s\">\n", _("Basic View"));
-		}
 		d_printf("<p>\n");
 	}
 
 	if (snum >= 0) {
 		d_printf("<table>\n");
-		show_parameters(snum, 1, advanced, 0);
+		show_parameters(snum, 1, parm_filter, 0);
 		d_printf("</table>\n");
 	}
 
-	if (advanced) {
-		d_printf("<input type=hidden name=\"Advanced\" value=1>\n");
-	}
-
 	d_printf("</FORM>\n");
 }
 
@@ -922,7 +1151,8 @@ static void printers_page(void)
 	char *s;
 	int snum=-1;
 	int i;
-	int advanced = 0;
+	int mode = 0;
+	unsigned int parm_filter = FLAG_BASIC;
 
 	if (share)
 		snum = lp_servicenumber(share);
@@ -935,9 +1165,6 @@ static void printers_page(void)
         d_printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
         d_printf(_("Attempting to delete these printers from SWAT will have no effect.\n"));
 
-	if (cgi_variable("Advanced") && !cgi_variable("Basic"))
-		advanced = 1;
-
 	if (cgi_variable("Commit") && snum >= 0) {
 		commit_parameters(snum);
 		if (snum >= iNumNonAutoPrintServices)
@@ -965,6 +1192,20 @@ static void printers_page(void)
 
 	d_printf("<FORM name=\"swatform\" method=post>\n");
 
+	if ( cgi_variable("ViewMode") )
+		mode = atoi(cgi_variable("ViewMode"));
+	ViewModeBoxes( mode );
+	switch ( mode ) {
+		case 0:
+			parm_filter = FLAG_BASIC;
+			break;
+		case 1:
+			parm_filter = FLAG_ADVANCED;
+			break;
+		case 2:
+			parm_filter = FLAG_DEVELOPER;
+			break;
+	}
 	d_printf("<table>\n");
 	d_printf("<tr><td><input type=submit name=selectshare value=\"%s\"></td>\n", _("Choose Printer"));
 	d_printf("<td><select name=share>\n");
@@ -1003,24 +1244,14 @@ static void printers_page(void)
 			d_printf("<input type=submit name=\"Commit\" value=\"%s\">\n", _("Commit Changes"));
 		}
 		d_printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", _("Reset Values"));
-		if (advanced == 0) {
-			d_printf("<input type=submit name=\"Advanced\" value=\"%s\">\n", _("Advanced View"));
-		} else {
-			d_printf("<input type=submit name=\"Basic\" value=\"%s\">\n", _("Basic View"));
-		}
 		d_printf("<p>\n");
 	}
 
 	if (snum >= 0) {
 		d_printf("<table>\n");
-		show_parameters(snum, 1, advanced, 1);
+		show_parameters(snum, 1, parm_filter, 1);
 		d_printf("</table>\n");
 	}
-
-	if (advanced) {
-		d_printf("<input type=hidden name=\"Advanced\" value=1>\n");
-	}
-
 	d_printf("</FORM>\n");
 }
 
@@ -1109,6 +1340,12 @@ static void printers_page(void)
 		viewconfig_page();
 	} else if (strcmp(page,"passwd")==0) {
 		passwd_page();
+	} else if (have_read_access && strcmp(page,"wizard")==0) {
+		wizard_page();
+	} else if (have_read_access && strcmp(page,"wizard_params")==0) {
+		wizard_params_page();
+	} else if (have_read_access && strcmp(page,"rewritecfg")==0) {
+		rewritecfg_file();
 	} else {
 		welcome_page();
 	}
-- 
cgit 


From 8c2a62c55566337a5cbb963ccef59e279a43af7d Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 9 Oct 2002 19:47:04 +0000
Subject: Use memmove when copies can overlap. Spotted by SUGIOKA Toshinobu
 <sugioka@itonet.co.jp>. Jeremy. (This used to be commit
 0ab08186f419a09e15f1ab7db621d429b1a3f994)

---
 source3/web/cgi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 7415fbe3f1..684086f61e 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -77,7 +77,7 @@ static void unescape(char *buf)
 			
 		*p = (c1<<4) | c2;
 
-		memcpy(p+1, p+3, strlen(p+3)+1);
+		memmove(p+1, p+3, strlen(p+3)+1);
 		p++;
 	}
 }
-- 
cgit 


From 35ac9d287f000c27dc864789b341bebe7acb4c74 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 26 Oct 2002 02:20:59 +0000
Subject: Try to catch up on the code I've put into HEAD that should be in 3.0:

 - vorlan's hosts allow with DNS names patch
 - use x_fileno() in debug.c, not the struct directly.
 - check for server timeout on password change (was reporting success)
 - better error/status loggin in both the pam_winbind client and winbindd_pam
server code.
 - (pdb_ldap) don't set the ldap version twice - we do it on every bind anyway.
(This used to be commit 9fa1863d8e7788eda83911ca2610754486b33069)
---
 source3/web/cgi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 684086f61e..c9cb78f6f1 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -636,7 +636,7 @@ return the hostname of the client
 char *cgi_remote_host(void)
 {
 	if (inetd_server) {
-		return get_socket_name(1);
+		return get_socket_name(1,False);
 	}
 	return getenv("REMOTE_HOST");
 }
-- 
cgit 


From dc5297f413c40f04e1fdae719e29d949e3301091 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 9 Nov 2002 16:57:45 +0000
Subject: Sync with HEAD (This used to be commit
 1a25dc776ddc36de9a214e023becff1ceb10290c)

---
 source3/web/swat.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index af6fa82ffe..fc38852245 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -696,9 +696,9 @@ static void wizard_page(void)
 		/* Now determine smb.conf WINS settings */
 		if (lp_wins_support())
 			winstype = 1;
-/*		if (strlen(lp_wins_server_list()) != 0 )
- *		winstype = 2;
- */		
+		if (lp_wins_server_list() && strlen(*lp_wins_server_list()))
+ 		        winstype = 2;
+ 		
 
 		/* Do we have a homes share? */
 		have_home = lp_servicenumber(HOMES_NAME);
-- 
cgit 


From 634c54310c92c48dd4eceec602e230a021bdcfc5 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 3 Jan 2003 08:28:12 +0000
Subject: Merge from HEAD - make Samba compile with -Wwrite-strings without
 additional warnings.  (Adds a lot of const).

Andrew Bartlett
(This used to be commit 3a7458f9472432ef12c43008414925fd1ce8ea0c)
---
 source3/web/cgi.c        | 18 +++++++++---------
 source3/web/statuspage.c |  2 +-
 source3/web/swat.c       | 30 +++++++++++++++---------------
 3 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index c9cb78f6f1..1cec580c67 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -40,7 +40,7 @@ static int num_variables;
 static int content_length;
 static int request_post;
 static char *query_string;
-static char *baseurl;
+static const char *baseurl;
 static char *pathinfo;
 static char *C_user;
 static BOOL inetd_server;
@@ -242,7 +242,7 @@ void cgi_load_variables(void)
   browser. Also doesn't allow for variables[] containing multiple variables
   with the same name and the same or different values.
   ***************************************************************************/
-char *cgi_variable(char *name)
+const char *cgi_variable(const char *name)
 {
 	int i;
 
@@ -255,7 +255,7 @@ char *cgi_variable(char *name)
 /***************************************************************************
 tell a browser about a fatal error in the http processing
   ***************************************************************************/
-static void cgi_setup_error(char *err, char *header, char *info)
+static void cgi_setup_error(const char *err, const char *header, const char *info)
 {
 	if (!got_request) {
 		/* damn browsers don't like getting cut off before they give a request */
@@ -301,10 +301,10 @@ authenticate when we are running as a CGI
   ***************************************************************************/
 static void cgi_web_auth(void)
 {
-	char *user = getenv("REMOTE_USER");
+	const char *user = getenv("REMOTE_USER");
 	struct passwd *pwd;
-	char *head = "Content-Type: text/html\r\n\r\n<HTML><BODY><H1>SWAT installation Error</H1>\n";
-	char *tail = "</BODY></HTML>\r\n";
+	const char *head = "Content-Type: text/html\r\n\r\n<HTML><BODY><H1>SWAT installation Error</H1>\n";
+	const char *tail = "</BODY></HTML>\r\n";
 
 	if (!user) {
 		printf("%sREMOTE_USER not set. Not authenticated by web server.<br>%s\n",
@@ -333,7 +333,7 @@ decode a base64 string in-place - simple and slow algorithm
   ***************************************************************************/
 static void base64_decode(char *s)
 {
-	char *b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	const char *b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 	int bit_offset, byte_offset, idx, i, n;
 	unsigned char *d = (unsigned char *)s;
 	char *p;
@@ -607,7 +607,7 @@ void cgi_setup(const char *rootdir, int auth_required)
 /***************************************************************************
 return the current pages URL
   ***************************************************************************/
-char *cgi_baseurl(void)
+const char *cgi_baseurl(void)
 {
 	if (inetd_server) {
 		return baseurl;
@@ -618,7 +618,7 @@ char *cgi_baseurl(void)
 /***************************************************************************
 return the current pages path info
   ***************************************************************************/
-char *cgi_pathinfo(void)
+const char *cgi_pathinfo(void)
 {
 	char *r;
 	if (inetd_server) {
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 3b597d44c0..8e41d62cb0 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -216,7 +216,7 @@ static int traverse_fn3(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 /* show the current server status */
 void status_page(void)
 {
-	char *v;
+	const char *v;
 	int autorefresh=0;
 	int refresh_interval=30;
 	TDB_CONTEXT *tdb;
diff --git a/source3/web/swat.c b/source3/web/swat.c
index fc38852245..21ae104cef 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -59,7 +59,7 @@ static int iNumNonAutoPrintServices = 0;
 
 /****************************************************************************
 ****************************************************************************/
-static int enum_index(int value, struct enum_list *enumlist)
+static int enum_index(int value, const struct enum_list *enumlist)
 {
 	int i;
 	for (i=0;enumlist[i].name;i++)
@@ -67,7 +67,7 @@ static int enum_index(int value, struct enum_list *enumlist)
 	return(i);
 }
 
-static char *fix_backslash(char *str)
+static char *fix_backslash(const char *str)
 {
 	static char newstring[1024];
 	char *p = newstring;
@@ -81,7 +81,7 @@ static char *fix_backslash(char *str)
 	return newstring;
 }
 
-static char *stripspaceupper(char *str)
+static char *stripspaceupper(const char *str)
 {
 	static char newstring[1024];
 	char *p = newstring;
@@ -94,7 +94,7 @@ static char *stripspaceupper(char *str)
 	return newstring;
 }
 
-static char *make_parm_name(char *label)
+static char *make_parm_name(const char *label)
 {
 	static char parmname[1024];
 	char *p = parmname;
@@ -111,7 +111,7 @@ static char *make_parm_name(char *label)
 /****************************************************************************
   include a lump of html in a page 
 ****************************************************************************/
-static int include_html(char *fname)
+static int include_html(const char *fname)
 {
 	int fd;
 	char buf[1024];
@@ -303,8 +303,8 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
 {
 	int i = 0;
 	struct parm_struct *parm;
-	char *heading = NULL;
-	char *last_heading = NULL;
+	const char *heading = NULL;
+	const char *last_heading = NULL;
 
 	while ((parm = lp_next_parameter(snum, &i, allparameters))) {
 		if (snum < 0 && parm->class == P_LOCAL && !(parm->flags & FLAG_GLOBAL))
@@ -440,7 +440,7 @@ static int save_reload(int snum)
 /****************************************************************************
   commit one parameter 
 ****************************************************************************/
-static void commit_parameter(int snum, struct parm_struct *parm, char *v)
+static void commit_parameter(int snum, struct parm_struct *parm, const char *v)
 {
 	int i;
 	char *s;
@@ -468,7 +468,7 @@ static void commit_parameters(int snum)
 	int i = 0;
 	struct parm_struct *parm;
 	pstring label;
-	char *v;
+	const char *v;
 
 	while ((parm = lp_next_parameter(snum, &i, 1))) {
 		slprintf(label, sizeof(label)-1, "parm_%s", make_parm_name(parm->label));
@@ -817,7 +817,7 @@ static void globals_page(void)
 ****************************************************************************/
 static void shares_page(void)
 {
-	char *share = cgi_variable("share");
+	const char *share = cgi_variable("share");
 	char *s;
 	int snum = -1;
 	int i;
@@ -915,8 +915,8 @@ static void shares_page(void)
 /*************************************************************
 change a password either locally or remotely
 *************************************************************/
-static BOOL change_password(const char *remote_machine, char *user_name, 
-			    char *old_passwd, char *new_passwd, 
+static BOOL change_password(const char *remote_machine, const char *user_name, 
+			    const char *old_passwd, const char *new_passwd, 
 				int local_flags)
 {
 	BOOL ret = False;
@@ -957,7 +957,7 @@ static BOOL change_password(const char *remote_machine, char *user_name,
 ****************************************************************************/
 static void chg_passwd(void)
 {
-	char *host;
+	const char *host;
 	BOOL rslt;
 	int local_flags = 0;
 
@@ -1042,7 +1042,7 @@ static void chg_passwd(void)
 ****************************************************************************/
 static void passwd_page(void)
 {
-	char *new_name = cgi_user_name();
+	const char *new_name = cgi_user_name();
 
 	/* 
 	 * After the first time through here be nice. If the user
@@ -1147,7 +1147,7 @@ static void passwd_page(void)
 ****************************************************************************/
 static void printers_page(void)
 {
-	char *share = cgi_variable("share");
+	const char *share = cgi_variable("share");
 	char *s;
 	int snum=-1;
 	int i;
-- 
cgit 


From f5d5df9644abc08ae1b16a0826eb8cf5c3de54d1 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 3 Jan 2003 17:39:30 +0000
Subject: patch to include support for daemontools from Michael Handler (This
 used to be commit a8db1b611d83bfd8dcf60f1e6d8fcbf57c798528)

---
 source3/web/startstop.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index e10dff4118..c6babff954 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -39,7 +39,7 @@ void start_smbd(void)
 
 	slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", dyn_SBINDIR);
 
-	become_daemon();
+	become_daemon(True);
 
 	execl(binfile, binfile, "-D", NULL);
 
@@ -60,7 +60,7 @@ void start_nmbd(void)
 
 	slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", dyn_SBINDIR);
 	
-	become_daemon();
+	become_daemon(True);
 
 	execl(binfile, binfile, "-D", NULL);
 
@@ -81,7 +81,7 @@ void start_winbindd(void)
 
 	slprintf(binfile, sizeof(pstring) - 1, "%s/winbindd", dyn_SBINDIR);
 
-	become_daemon();
+	become_daemon(True);
 
 	execl(binfile, binfile, NULL);
 
-- 
cgit 


From 99cdb462083381c88689a4e698ca48b6ed4cf5ac Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 15 Jan 2003 18:57:41 +0000
Subject: *lots of small merges form HEAD *sync up configure.in *don't build
 torture tools in make all *make sure to remove torture tools as part of make
 clean (This used to be commit 0fb724b3216eeeb97e61ff12755ca3a31bcad6ef)

---
 source3/web/cgi.c | 45 ++++-----------------------------------------
 1 file changed, 4 insertions(+), 41 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 1cec580c67..018dd3602f 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -46,43 +46,6 @@ 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 char *grab_line(FILE *f, int *cl)
 {
 	char *ret = NULL;
@@ -167,8 +130,8 @@ void cgi_load_variables(void)
 			    !variables[num_variables].value)
 				continue;
 
-			unescape(variables[num_variables].value);
-			unescape(variables[num_variables].name);
+			rfc1738_unescape(variables[num_variables].value);
+			rfc1738_unescape(variables[num_variables].name);
 
 #ifdef DEBUG_COMMENTS
 			printf("<!== POST var %s has value \"%s\"  ==>\n",
@@ -198,8 +161,8 @@ void cgi_load_variables(void)
 			    !variables[num_variables].value)
 				continue;
 
-			unescape(variables[num_variables].value);
-			unescape(variables[num_variables].name);
+			rfc1738_unescape(variables[num_variables].value);
+			rfc1738_unescape(variables[num_variables].name);
 
 #ifdef DEBUG_COMMENTS
                         printf("<!== Commandline var %s has value \"%s\"  ==>\n",
-- 
cgit 


From 01b805e06bf495061f72616b0edf6bf766121b91 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 17 Jan 2003 14:34:07 +0000
Subject: connect to the actual netbios name in smb.conf and not LOCALHOST
 (This used to be commit 50d65996e497a6b4647b74dadb4a7f3f5dddf2ed)

---
 source3/web/diagnose.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index 396499bcb9..efd6d1d0a1 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -73,7 +73,7 @@ BOOL smbd_running(void)
 	if (!cli_initialise(&cli))
 		return False;
 
-	if (!cli_connect(&cli, "localhost", &loopback_ip)) {
+	if (!cli_connect(&cli, global_myname(), &loopback_ip)) {
 		cli_shutdown(&cli);
 		return False;
 	}
-- 
cgit 


From 1cba0a757970ffd8b81d61c88965010968ab3eff Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 28 Jan 2003 12:07:02 +0000
Subject: Merge from HEAD:  - NTLMSSP over SPENGO (sesssion-setup-and-x)
 cleanup and code refactor.   - also consequential changes to the NTLMSSP and
 SPNEGO parsing functions   - and the client code that uses the same functions
  - Add ntlm_auth, a NTLMSSP authentication interface for use by applications 
   like Squid and Apache.   - also consquential changes to use common code for
 base64 encode/decode.  - Winbind changes to support ntlm_auth (I don't want
 this program to need    to read smb.conf, instead getting all it's details
 over the pipe).  - nmbd changes for fstrcat() instead of fstrcpy().

Andrew Bartlett
(This used to be commit fbb46da79cf322570a7e3318100c304bbf33409e)
---
 source3/web/cgi.c | 31 -------------------------------
 1 file changed, 31 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 018dd3602f..35f3266283 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -291,37 +291,6 @@ static void cgi_web_auth(void)
 	passwd_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
-- 
cgit 


From 9c858c3188bf26a754936fff5f1a1a0c263ba7cd Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 1 Feb 2003 07:27:01 +0000
Subject: Merge from HEAD - convert username/password to unix before checking
 them in SWAT. (This used to be commit
 8485c51bc47f45a6263bda83a0bc3ba15abcd250)

---
 source3/web/cgi.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 35f3266283..46f33789bf 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -297,7 +297,8 @@ handle a http authentication line
   ***************************************************************************/
 static BOOL cgi_handle_authorization(char *line)
 {
-	char *p, *user, *user_pass;
+	char *p;
+	fstring user, user_pass;
 	struct passwd *pass = NULL;
 
 	if (strncasecmp(line,"Basic ", 6)) {
@@ -314,9 +315,15 @@ static BOOL cgi_handle_authorization(char *line)
 		goto err;
 	}
 	*p = 0;
-	user = line;
-	user_pass = p+1;
-	
+
+	convert_string(CH_DISPLAY, CH_UNIX, 
+		       line, -1, 
+		       user, sizeof(user));
+
+	convert_string(CH_DISPLAY, CH_UNIX, 
+		       p+1, -1, 
+		       user_pass, sizeof(user_pass));
+
 	/*
 	 * Try and get the user from the UNIX password file.
 	 */
-- 
cgit 


From 17ec9642cdf29257297b56a202966863c9dac56f Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Tue, 18 Feb 2003 23:17:59 +0000
Subject: base64_decode() with heimdal libs, so I've renamed it
 base64_decode_inplace(). (This used to be commit
 d510ff85fb0dafddf3dea9412a09eeee6e70f0cb)

---
 source3/web/cgi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 46f33789bf..8abc2f0bd5 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -306,7 +306,7 @@ static BOOL cgi_handle_authorization(char *line)
 	}
 	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
-- 
cgit 


From 938f37afc2b47184e5802324db31fbb357a4b6cc Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 28 Feb 2003 08:48:26 +0000
Subject: Fix HTTP error codes (patch by Vance Lankhaar) (This used to be
 commit e660b0b8d034c6cb9771601c64b952380d136ca1)

---
 source3/web/cgi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 8abc2f0bd5..212c2884b6 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -455,11 +455,11 @@ void cgi_setup(const char *rootdir, int auth_required)
 	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"))) {
@@ -478,7 +478,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 ");
 	}
 
-- 
cgit 


From c945a9c97ffe476313ac64aa07f631c939654683 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 17 Mar 2003 22:33:34 +0000
Subject: Merge from HEAD:

new 'net ads dn'

doxygen fixes

net help fixes.
(This used to be commit de24fcb097ebf0d1aec92e787622cab64d10c553)
---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 21ae104cef..d6693b4e75 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -21,7 +21,7 @@
 */
 
 /**
- * @group swat SWAT
+ * @defgroup swat SWAT - Samba Web Administration Tool
  * @{ 
  * @file swat.c
  *
-- 
cgit 


From f46edac4bf1946ae4b2cb5ee6c07e8485d4f79e7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 20 Mar 2003 11:16:14 +0000
Subject: Make swat use popt (This used to be commit
 eccb6998111ce7a56bfd11578ccd7c09958f407e)

---
 source3/web/swat.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index d6693b4e75..bece4e71e2 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1261,10 +1261,16 @@ static void printers_page(void)
  **/
  int main(int argc, char *argv[])
 {
-	extern char *optarg;
-	extern int optind;
 	int opt;
 	char *page;
+	poptContext pc;
+	struct poptOption long_options[] = {
+		POPT_AUTOHELP
+		{ "disable-authentication", 'a', POPT_ARG_VAL, &demo_mode, TRUE, "Disable authentication (demo mode)" },
+		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
+		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile},
+		{ 0, 0, 0, 0 }
+	};
 
 	fault_setup(NULL);
 	umask(S_IWGRP | S_IWOTH);
@@ -1288,16 +1294,13 @@ static void printers_page(void)
 	close(2);
 	open("/dev/null", O_WRONLY);
 
-	while ((opt = getopt(argc, argv,"s:a")) != EOF) {
-		switch (opt) {
-		case 's':
-			pstrcpy(dyn_CONFIGFILE,optarg);
-			break;	  
-		case 'a':
-			demo_mode = True;
-			break;	  
-		}
-	}
+	pc = poptGetContext("swat", argc, (const char **) argv, long_options, 0);
+
+	/* Parse command line options */
+
+	while((opt = poptGetNextOpt(pc)) != -1) { }
+
+	poptFreeContext(pc);
 
 	setup_logging(argv[0],False);
 	load_config(True);
-- 
cgit 


From a50253f744fe704e4b16cc5cb790b6796bd27fac Mon Sep 17 00:00:00 2001
From: John Terpstra <jht@samba.org>
Date: Wed, 26 Mar 2003 03:40:24 +0000
Subject: A fixed type TRUE -> True, reported by Paul Green. (This used to be
 commit 14499e64555481fdd5fa8ba656a4cba9a597a86b)

---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index bece4e71e2..92dece6ecd 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1266,7 +1266,7 @@ static void printers_page(void)
 	poptContext pc;
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
-		{ "disable-authentication", 'a', POPT_ARG_VAL, &demo_mode, TRUE, "Disable authentication (demo mode)" },
+		{ "disable-authentication", 'a', POPT_ARG_VAL, &demo_mode, True, "Disable authentication (demo mode)" },
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile},
 		{ 0, 0, 0, 0 }
-- 
cgit 


From e6c48331eba20b02239e5668d9d9cb85da9dc163 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 3 Apr 2003 01:51:13 +0000
Subject: Fixup swat warning. Fix winbindd dual mode in the same was as in
 APP_HEAD. "Ken Cross" <kcross@nssolutions.com> noticed the problem. Jeremy.
 (This used to be commit 8bbcb833317245d7f5b8695e4a5c676f67003937)

---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 92dece6ecd..6d14e9db98 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1262,7 +1262,7 @@ static void printers_page(void)
  int main(int argc, char *argv[])
 {
 	int opt;
-	char *page;
+	const char *page;
 	poptContext pc;
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
-- 
cgit 


From 63cbbe26923b8f6bbed11428a3a218a88d17ffe7 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 14 Apr 2003 03:30:20 +0000
Subject: Merge Jelmer's popt updates from HEAD. (This used to be commit
 98e84b3e83d2a365c818ea64f9418edb29d690f2)

---
 source3/web/swat.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 6d14e9db98..fa319bb3ae 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1267,9 +1267,8 @@ static void printers_page(void)
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
 		{ "disable-authentication", 'a', POPT_ARG_VAL, &demo_mode, True, "Disable authentication (demo mode)" },
-		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
-		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile},
-		{ 0, 0, 0, 0 }
+		POPT_COMMON_SAMBA
+		POPT_TABLEEND
 	};
 
 	fault_setup(NULL);
-- 
cgit 


From 9c6e58869f45dd2be0904b9ecf9e757b2b3841d6 Mon Sep 17 00:00:00 2001
From: John Terpstra <jht@samba.org>
Date: Tue, 22 Apr 2003 23:19:09 +0000
Subject: Added Stephen Roylance's patch - Adds to Status page, a Start All,
 Restart All and Stop All deamons button. (This used to be commit
 57cfcb3108935f46cb3938b403a3eaba2888fb55)

---
 source3/web/statuspage.c | 47 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 9 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 8e41d62cb0..ddbe658a6c 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -220,45 +220,46 @@ void status_page(void)
 	int autorefresh=0;
 	int refresh_interval=30;
 	TDB_CONTEXT *tdb;
+	int nr_running=0;
 
 	smbd_pid = pidfile_pid("smbd");
 
-	if (cgi_variable("smbd_restart")) {
+	if (cgi_variable("smbd_restart") || cgi_variable("all_restart")) {
 		stop_smbd();
 		start_smbd();
 	}
 
-	if (cgi_variable("smbd_start")) {
+	if (cgi_variable("smbd_start") || cgi_variable("all_start")) {
 		start_smbd();
 	}
 
-	if (cgi_variable("smbd_stop")) {
+	if (cgi_variable("smbd_stop") || cgi_variable("all_stop")) {
 		stop_smbd();
 	}
 
-	if (cgi_variable("nmbd_restart")) {
+	if (cgi_variable("nmbd_restart") || cgi_variable("all_restart")) {
 		stop_nmbd();
 		start_nmbd();
 	}
-	if (cgi_variable("nmbd_start")) {
+	if (cgi_variable("nmbd_start") || cgi_variable("all_start")) {
 		start_nmbd();
 	}
 
-	if (cgi_variable("nmbd_stop")) {
+	if (cgi_variable("nmbd_stop")|| cgi_variable("all_stop")) {
 		stop_nmbd();
 	}
 
 #ifdef WITH_WINBIND
-	if (cgi_variable("winbindd_restart")) {
+	if (cgi_variable("winbindd_restart") || cgi_variable("all_restart")) {
 		stop_winbindd();
 		start_winbindd();
 	}
 
-	if (cgi_variable("winbindd_start")) {
+	if (cgi_variable("winbindd_start") || cgi_variable("all_start")) {
 		start_winbindd();
 	}
 
-	if (cgi_variable("winbindd_stop")) {
+	if (cgi_variable("winbindd_stop") || cgi_variable("all_stop")) {
 		stop_winbindd();
 	}
 #endif
@@ -314,6 +315,7 @@ void status_page(void)
 	d_printf("<tr><td>%s</td><td>%s</td>\n", _("smbd:"), smbd_running()?_("running"):_("not running"));
 	if (geteuid() == 0) {
 	    if (smbd_running()) {
+		nr_running++;
 		d_printf("<td><input type=submit name=\"smbd_stop\" value=\"%s\"></td>\n", _("Stop smbd"));
 	    } else {
 		d_printf("<td><input type=submit name=\"smbd_start\" value=\"%s\"></td>\n", _("Start smbd"));
@@ -326,11 +328,25 @@ void status_page(void)
 	d_printf("<tr><td>%s</td><td>%s</td>\n", _("nmbd:"), nmbd_running()?_("running"):_("not running"));
 	if (geteuid() == 0) {
 	    if (nmbd_running()) {
+		nr_running++;
 		d_printf("<td><input type=submit name=\"nmbd_stop\" value=\"%s\"></td>\n", _("Stop nmbd"));
 	    } else {
 		d_printf("<td><input type=submit name=\"nmbd_start\" value=\"%s\"></td>\n", _("Start nmbd"));
 	    }
 	    d_printf("<td><input type=submit name=\"nmbd_restart\" value=\"%s\"></td>\n", _("Restart nmbd"));
+#ifndef WITH_WINBIND
+	    if (nr_running >= 1) {
+	        /* stop, restart all */
+		d_printf("</tr><tr><td></td><td></td>\n");
+		d_printf("<td><input type=submit name=\"all_stop\" value=\"%s\"></td>\n", _("Stop All"));
+		d_printf("<td><input type=submit name=\"all_restart\" value=\"%s\"></td>\n", _("Restart All"));
+	    }
+	    else if (nr_running == 0) {
+	    	/* start all */
+		d_printf("</tr><tr><td></td><td></td>\n");
+		d_printf("<td><input type=submit name=\"all_start\" value=\"%s\"></td>\n", _("Start All"));
+	    }    
+#endif	    
 	}
 	d_printf("</tr>\n");
 
@@ -339,11 +355,24 @@ void status_page(void)
 	d_printf("<tr><td>%s</td><td>%s</td>\n", _("winbindd:"), winbindd_running()?_("running"):_("not running"));
 	if (geteuid() == 0) {
 	    if (winbindd_running()) {
+		nr_running++;
 		d_printf("<td><input type=submit name=\"winbindd_stop\" value=\"%s\"></td>\n", _("Stop winbindd"));
 	    } else {
 		d_printf("<td><input type=submit name=\"winbindd_start\" value=\"%s\"></td>\n", _("Start winbindd"));
 	    }
 	    d_printf("<td><input type=submit name=\"winbindd_restart\" value=\"%s\"></td>\n", _("Restart winbindd"));
+	    if (nr_running >= 1) {
+	        /* stop, restart all */
+		d_printf("</tr><tr><td></td><td></td>\n");
+		d_printf("<td><input type=submit name=\"all_stop\" value=\"%s\"></td>\n", _("Stop All"));
+		d_printf("<td><input type=submit name=\"all_restart\" value=\"%s\"></td>\n", _("Restart All"));
+	    }
+	    else if (nr_running == 0) {
+	    	/* start all */
+		d_printf("</tr><tr><td></td><td></td>\n");
+		d_printf("<td><input type=submit name=\"all_start\" value=\"%s\"></td>\n", _("Start All"));
+	    }
+		
 	}
 	d_printf("</tr>\n");
 #endif
-- 
cgit 


From 8f6e88dbb6936abdb62a90a6bb0ef947ec8c9bb6 Mon Sep 17 00:00:00 2001
From: John Terpstra <jht@samba.org>
Date: Thu, 24 Apr 2003 02:35:00 +0000
Subject: Added patch from Stephen Roylance. (This used to be commit
 71369f90890eeca399fec55d978a5dd4a13f077f)

---
 source3/web/startstop.c  |  6 ------
 source3/web/statuspage.c | 46 ++++++++++++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index c6babff954..93e8650c2b 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -22,8 +22,6 @@
 #include "../web/swat_proto.h"
 #include "dynconfig.h"
 
-/** Need to wait for daemons to startup */
-#define SLEEP_TIME 3
 
 /** Startup smbd from web interface. */
 void start_smbd(void)
@@ -33,7 +31,6 @@ void start_smbd(void)
 	if (geteuid() != 0) return;
 
 	if (fork()) {
-		sleep(SLEEP_TIME);
 		return;
 	}
 
@@ -54,7 +51,6 @@ void start_nmbd(void)
 	if (geteuid() != 0) return;
 
 	if (fork()) {
-		sleep(SLEEP_TIME);
 		return;
 	}
 
@@ -75,7 +71,6 @@ void start_winbindd(void)
 	if (geteuid() != 0) return;
 
 	if (fork()) {
-		sleep(SLEEP_TIME);
 		return;
 	}
 
@@ -133,5 +128,4 @@ void kill_pid(pid_t pid)
 	if (pid <= 0) return;
 
 	kill(pid, SIGTERM);
-	sleep(SLEEP_TIME);
 }
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index ddbe658a6c..44461232b8 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -23,6 +23,9 @@
 
 #define PIDMAP		struct PidMap
 
+/* how long to wait for start/stops to take effect */
+#define SLEEP_TIME 3
+
 PIDMAP {
 	PIDMAP	*next, *prev;
 	pid_t	pid;
@@ -158,6 +161,7 @@ static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 		slprintf(buf,sizeof(buf)-1,"kill_%d", (int)crec.pid);
 		if (cgi_variable(buf)) {
 			kill_pid(crec.pid);
+			sleep(SLEEP_TIME);
 		}
 	}
 	return 0;
@@ -221,48 +225,62 @@ void status_page(void)
 	int refresh_interval=30;
 	TDB_CONTEXT *tdb;
 	int nr_running=0;
+	BOOL waitup = False;
 
 	smbd_pid = pidfile_pid("smbd");
 
 	if (cgi_variable("smbd_restart") || cgi_variable("all_restart")) {
 		stop_smbd();
 		start_smbd();
+		waitup=True;
 	}
 
 	if (cgi_variable("smbd_start") || cgi_variable("all_start")) {
 		start_smbd();
+		waitup=True;
 	}
 
 	if (cgi_variable("smbd_stop") || cgi_variable("all_stop")) {
 		stop_smbd();
+		waitup=True;
 	}
 
 	if (cgi_variable("nmbd_restart") || cgi_variable("all_restart")) {
 		stop_nmbd();
 		start_nmbd();
+		waitup=True;
 	}
 	if (cgi_variable("nmbd_start") || cgi_variable("all_start")) {
 		start_nmbd();
+		waitup=True;
 	}
 
 	if (cgi_variable("nmbd_stop")|| cgi_variable("all_stop")) {
 		stop_nmbd();
+		waitup=True;
 	}
 
 #ifdef WITH_WINBIND
 	if (cgi_variable("winbindd_restart") || cgi_variable("all_restart")) {
 		stop_winbindd();
 		start_winbindd();
+		waitup=True;
 	}
 
 	if (cgi_variable("winbindd_start") || cgi_variable("all_start")) {
 		start_winbindd();
+		waitup=True;
 	}
 
 	if (cgi_variable("winbindd_stop") || cgi_variable("all_stop")) {
 		stop_winbindd();
+		waitup=True;
 	}
 #endif
+	/* wait for daemons to start/stop */
+	if (waitup)
+		sleep(SLEEP_TIME);
+	
 	if (cgi_variable("autorefresh")) {
 		autorefresh = 1;
 	} else if (cgi_variable("norefresh")) {
@@ -333,20 +351,7 @@ void status_page(void)
 	    } else {
 		d_printf("<td><input type=submit name=\"nmbd_start\" value=\"%s\"></td>\n", _("Start nmbd"));
 	    }
-	    d_printf("<td><input type=submit name=\"nmbd_restart\" value=\"%s\"></td>\n", _("Restart nmbd"));
-#ifndef WITH_WINBIND
-	    if (nr_running >= 1) {
-	        /* stop, restart all */
-		d_printf("</tr><tr><td></td><td></td>\n");
-		d_printf("<td><input type=submit name=\"all_stop\" value=\"%s\"></td>\n", _("Stop All"));
-		d_printf("<td><input type=submit name=\"all_restart\" value=\"%s\"></td>\n", _("Restart All"));
-	    }
-	    else if (nr_running == 0) {
-	    	/* start all */
-		d_printf("</tr><tr><td></td><td></td>\n");
-		d_printf("<td><input type=submit name=\"all_start\" value=\"%s\"></td>\n", _("Start All"));
-	    }    
-#endif	    
+	    d_printf("<td><input type=submit name=\"nmbd_restart\" value=\"%s\"></td>\n", _("Restart nmbd"));    
 	}
 	d_printf("</tr>\n");
 
@@ -361,22 +366,23 @@ void status_page(void)
 		d_printf("<td><input type=submit name=\"winbindd_start\" value=\"%s\"></td>\n", _("Start winbindd"));
 	    }
 	    d_printf("<td><input type=submit name=\"winbindd_restart\" value=\"%s\"></td>\n", _("Restart winbindd"));
+	}
+	d_printf("</tr>\n");
+#endif
+
+	if (geteuid() == 0) {
+	    d_printf("<tr><td></td><td></td>\n");
 	    if (nr_running >= 1) {
 	        /* stop, restart all */
-		d_printf("</tr><tr><td></td><td></td>\n");
 		d_printf("<td><input type=submit name=\"all_stop\" value=\"%s\"></td>\n", _("Stop All"));
 		d_printf("<td><input type=submit name=\"all_restart\" value=\"%s\"></td>\n", _("Restart All"));
 	    }
 	    else if (nr_running == 0) {
 	    	/* start all */
-		d_printf("</tr><tr><td></td><td></td>\n");
 		d_printf("<td><input type=submit name=\"all_start\" value=\"%s\"></td>\n", _("Start All"));
 	    }
-		
+	    d_printf("</tr>\n");
 	}
-	d_printf("</tr>\n");
-#endif
-
 	d_printf("</table>\n");
 	fflush(stdout);
 
-- 
cgit 


From fae80fe1a050b36dbf862ae1ac9170fea247b0a9 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 7 May 2003 18:28:24 +0000
Subject: Make fchown, fchmod conditional for systems that don't have them.
 Jeremy. (This used to be commit cf78b1e7fe72aec72d03c86c46a8ca49df539c11)

---
 source3/web/swat.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index fa319bb3ae..7f9492933a 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -417,7 +417,11 @@ static int save_reload(int snum)
 	/* just in case they have used the buggy xinetd to create the file */
 	if (fstat(fileno(f), &st) == 0 &&
 	    (st.st_mode & S_IWOTH)) {
+#if defined HAVE_FCHMOD
 		fchmod(fileno(f), S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
+#else
+		chmod(dyn_CONFIGFILE, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
+#endif
 	}
 
 	write_config(f, False);
-- 
cgit 


From c507ebe56741d773bf6e7ad547863a2da1aee687 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 10 May 2003 10:53:48 +0000
Subject: Patch from metze and me that adds dummy smb_register_*() functions so
 that is now possible to, for example, load a module which contains an auth
 method into a binary without the auth/ subsystem built in. (This used to be
 commit 74d9ecfe2dd7364643d32acb62ade957bd71cd0d)

---
 source3/web/swat.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 7f9492933a..e93fb2e5e1 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -31,6 +31,9 @@
 #include "includes.h"
 #include "../web/swat_proto.h"
 
+#define HAVE_SMB_REGISTER_PASSDB
+#include "module_dummy.h"
+
 #define GLOBALS_SNUM -1
 
 static BOOL demo_mode = False;
-- 
cgit 


From 0914e541f5480834c1b0ddc98b5f71f7f7abf9cb Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 10 May 2003 11:49:51 +0000
Subject: Reverse previous patch from Stefan and me after comments by Andrew
 Bartlett (This used to be commit d817eaf0ecca2d878ab1ffcf7a747a02d71c811e)

---
 source3/web/swat.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index e93fb2e5e1..7f9492933a 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -31,9 +31,6 @@
 #include "includes.h"
 #include "../web/swat_proto.h"
 
-#define HAVE_SMB_REGISTER_PASSDB
-#include "module_dummy.h"
-
 #define GLOBALS_SNUM -1
 
 static BOOL demo_mode = False;
-- 
cgit 


From b311be4a010307832dbfdb04f7574cbd418fdcad Mon Sep 17 00:00:00 2001
From: John Terpstra <jht@samba.org>
Date: Mon, 26 May 2003 16:54:39 +0000
Subject: Metze's patches: here's a small patch which renames the symbol 'log'
 to some better names to avoid compiler warnings about shodow global var 'log'
 in proto.h

we now have a GLOBAL_SECTION_SNUM -1

so we should use it in swat too:-)
(This used to be commit a4733a0748b4d24457558304ad47852c69905cb2)
---
 source3/web/swat.c | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 7f9492933a..d97278c485 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -31,8 +31,6 @@
 #include "includes.h"
 #include "../web/swat_proto.h"
 
-#define GLOBALS_SNUM -1
-
 static BOOL demo_mode = False;
 static BOOL have_write_access = False;
 static BOOL have_read_access = False;
@@ -579,7 +577,7 @@ static void wizard_params_page(void)
 	d_printf("<H2>Wizard Parameter Edit Page</H2>\n");
 
 	if (cgi_variable("Commit")) {
-		commit_parameters(GLOBALS_SNUM);
+		commit_parameters(GLOBAL_SECTION_SNUM);
 		save_reload(0);
 	}
 
@@ -593,7 +591,7 @@ static void wizard_params_page(void)
 	d_printf("<p>\n");
 	
 	d_printf("<table>\n");
-	show_parameters(GLOBALS_SNUM, 1, parm_filter, 0);
+	show_parameters(GLOBAL_SECTION_SNUM, 1, parm_filter, 0);
 	d_printf("</table>\n");
 	d_printf("</form>\n");
 }
@@ -603,7 +601,7 @@ static void wizard_params_page(void)
 ****************************************************************************/
 static void rewritecfg_file(void)
 {
-	commit_parameters(GLOBALS_SNUM);
+	commit_parameters(GLOBAL_SECTION_SNUM);
 	save_reload(0);
 	d_printf("<H2>Note: smb.conf %s</H2>\n", _("file has been read and rewritten"));
 }
@@ -637,37 +635,37 @@ static void wizard_page(void)
 		HomeExpo = atoi(cgi_variable("HomeExpo"));
 
 		/* Plain text passwords are too badly broken - use encrypted passwords only */
-		lp_do_parameter( GLOBALS_SNUM, "encrypt passwords", "Yes");
+		lp_do_parameter( GLOBAL_SECTION_SNUM, "encrypt passwords", "Yes");
 		
 		switch ( SerType ){
 			case 0:
 				/* Stand-alone Server */
-				lp_do_parameter( GLOBALS_SNUM, "security", "USER" );
-				lp_do_parameter( GLOBALS_SNUM, "domain logons", "No" );
+				lp_do_parameter( GLOBAL_SECTION_SNUM, "security", "USER" );
+				lp_do_parameter( GLOBAL_SECTION_SNUM, "domain logons", "No" );
 				break;
 			case 1:
 				/* Domain Member */
-				lp_do_parameter( GLOBALS_SNUM, "security", "DOMAIN" );
-				lp_do_parameter( GLOBALS_SNUM, "domain logons", "No" );
+				lp_do_parameter( GLOBAL_SECTION_SNUM, "security", "DOMAIN" );
+				lp_do_parameter( GLOBAL_SECTION_SNUM, "domain logons", "No" );
 				break;
 			case 2:
 				/* Domain Controller */
-				lp_do_parameter( GLOBALS_SNUM, "security", "USER" );
-				lp_do_parameter( GLOBALS_SNUM, "domain logons", "Yes" );
+				lp_do_parameter( GLOBAL_SECTION_SNUM, "security", "USER" );
+				lp_do_parameter( GLOBAL_SECTION_SNUM, "domain logons", "Yes" );
 				break;
 		}
 		switch ( winstype ) {
 			case 0:
-				lp_do_parameter( GLOBALS_SNUM, "wins support", "No" );
-				lp_do_parameter( GLOBALS_SNUM, "wins server", "" );
+				lp_do_parameter( GLOBAL_SECTION_SNUM, "wins support", "No" );
+				lp_do_parameter( GLOBAL_SECTION_SNUM, "wins server", "" );
 				break;
 			case 1:
-				lp_do_parameter( GLOBALS_SNUM, "wins support", "Yes" );
-				lp_do_parameter( GLOBALS_SNUM, "wins server", "" );
+				lp_do_parameter( GLOBAL_SECTION_SNUM, "wins support", "Yes" );
+				lp_do_parameter( GLOBAL_SECTION_SNUM, "wins server", "" );
 				break;
 			case 2:
-				lp_do_parameter( GLOBALS_SNUM, "wins support", "No" );
-				lp_do_parameter( GLOBALS_SNUM, "wins server", cgi_variable("WINSAddr"));
+				lp_do_parameter( GLOBAL_SECTION_SNUM, "wins support", "No" );
+				lp_do_parameter( GLOBAL_SECTION_SNUM, "wins server", cgi_variable("WINSAddr"));
 				break;
 		}
 
@@ -677,7 +675,7 @@ static void wizard_page(void)
 			
 			pstrcpy(unix_share,HOMES_NAME);
 			load_config(False);
-			lp_copy_service(GLOBALS_SNUM, unix_share);
+			lp_copy_service(GLOBAL_SECTION_SNUM, unix_share);
 			iNumNonAutoPrintServices = lp_numservices();
 			have_home = lp_servicenumber(HOMES_NAME);
 			lp_do_parameter( have_home, "read only", "No");
@@ -692,7 +690,7 @@ static void wizard_page(void)
 			have_home = -1;
 		}
 
-		commit_parameters(GLOBALS_SNUM);
+		commit_parameters(GLOBAL_SECTION_SNUM);
 		save_reload(0);
 	}
 	else
@@ -778,7 +776,7 @@ static void globals_page(void)
 	d_printf("<H2>%s</H2>\n", _("Global Variables"));
 
 	if (cgi_variable("Commit")) {
-		commit_parameters(GLOBALS_SNUM);
+		commit_parameters(GLOBAL_SECTION_SNUM);
 		save_reload(0);
 	}
 
@@ -810,7 +808,7 @@ static void globals_page(void)
 
 	d_printf("<p>\n");
 	d_printf("<table>\n");
-	show_parameters(GLOBALS_SNUM, 1, parm_filter, 0);
+	show_parameters(GLOBAL_SECTION_SNUM, 1, parm_filter, 0);
 	d_printf("</table>\n");
 	d_printf("</form>\n");
 }
@@ -847,7 +845,7 @@ static void shares_page(void)
 
 	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
 		load_config(False);
-		lp_copy_service(GLOBALS_SNUM, share);
+		lp_copy_service(GLOBAL_SECTION_SNUM, share);
 		iNumNonAutoPrintServices = lp_numservices();
 		save_reload(0);
 		snum = lp_servicenumber(share);
@@ -1186,7 +1184,7 @@ static void printers_page(void)
 
 	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
 		load_config(False);
-		lp_copy_service(GLOBALS_SNUM, share);
+		lp_copy_service(GLOBAL_SECTION_SNUM, share);
 		iNumNonAutoPrintServices = lp_numservices();
 		snum = lp_servicenumber(share);
 		lp_do_parameter(snum, "print ok", "Yes");
-- 
cgit 


From 274f1f8806f091a38bbf65363d7edf681459b58d Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 22 Jul 2003 00:20:53 +0000
Subject: Replace the eight (!) copies of dummy become/unbecome root with a
 single one. (This used to be commit 8b818ce381595cdcb36631a2440d6aa0038805f1)

---
 source3/web/swat.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index d97278c485..7326e95415 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -51,10 +51,6 @@ static int iNumNonAutoPrintServices = 0;
 #define ENABLE_USER_FLAG "enable_user_flag"
 #define RHOST "remote_host"
 
-/* we need these because we link to locking*.o */
- void become_root(void) {}
- void unbecome_root(void) {}
-
 /****************************************************************************
 ****************************************************************************/
 static int enum_index(int value, const struct enum_list *enumlist)
-- 
cgit 


From 80c1f1d865b13a63c7a60876b63458119566e044 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 22 Jul 2003 04:31:20 +0000
Subject: Fixup a bunch of printf-style functions and debugs to use unsigned
 long when displaying pid_t, uid_t and gid_t values.  This removes a whole lot
 of warnings on some of the 64-bit build farm machines as well as help us out
 when 64-bit uid/gid/pid values come along. (This used to be commit
 f93528ba007c8800a850678f35f499fb7360fb9a)

---
 source3/web/statuspage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 44461232b8..c579e8f112 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -93,7 +93,7 @@ static char *mapPid2Machine (pid_t pid)
 	}
 
 	/* PID not in list or machine name NULL? return pid as string */
-	snprintf (pidbuf, sizeof (pidbuf) - 1, "%d", pid);
+	snprintf (pidbuf, sizeof (pidbuf) - 1, "%lu", (unsigned long)pid);
 	return pidbuf;
 }
 
-- 
cgit 


From 3a5dc7c2ecacecf7dd0cfd71ff1bb298d70b391b Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 23 Jul 2003 12:33:59 +0000
Subject: convert snprintf() calls using pstrings & fstrings to pstr_sprintf()
 and fstr_sprintf() to try to standardize. lots of snprintf() calls were using
 len-1; some were using len.  At least this helps to be consistent. (This used
 to be commit 9f835b85dd38cbe655eb19021ff763f31886ac00)

---
 source3/web/swat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 7326e95415..b43cdd08f1 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -164,12 +164,12 @@ static const char* get_parm_translated(
 	static pstring output;
 	if(strcmp(pLabel, pTranslated) != 0)
 	{
-		snprintf(output, sizeof(output),
+		pstr_sprintf(output,
 		  "<A HREF=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
 		   pAnchor, pHelp, pLabel, pTranslated);
 		return output;
 	}
-	snprintf(output, sizeof(output), 
+	pstr_sprintf(output, 
 	  "<A HREF=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s",
 	  pAnchor, pHelp, pLabel);
 	return output;
-- 
cgit 


From 168beb5360538f44fd7e380860a6f5f9700dfb1a Mon Sep 17 00:00:00 2001
From: John Terpstra <jht@samba.org>
Date: Sat, 26 Jul 2003 16:56:38 +0000
Subject: Added buttons to change view mode. Fixes bug #212 (This used to be
 commit 37d2eed445ec825e31082e4e71c858e1e6356566)

---
 source3/web/swat.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index b43cdd08f1..074f5138a3 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -519,11 +519,16 @@ static void show_main_buttons(void)
  ****************************************************************************/
 static void ViewModeBoxes(int mode)
 {
-	d_printf("<p>%s\n", _("Configuration View:&nbsp"));
+	d_printf("<p>%s\n", _("Configuration View:&nbsp Current View is:&nbsp"));
 	d_printf("<input type=radio name=\"ViewMode\" value=0 %s>Basic\n", (mode == 0) ? "checked" : "");
 	d_printf("<input type=radio name=\"ViewMode\" value=1 %s>Advanced\n", (mode == 1) ? "checked" : "");
 	d_printf("<input type=radio name=\"ViewMode\" value=2 %s>Developer\n", (mode == 2) ? "checked" : "");
 	d_printf("</p><br>\n");
+	d_printf("<p>%s\n", _("Change View To:&nbsp"));
+	d_printf("<input type=submit name=\"BasicMode\" value=\"%s\">\n", _("Basic Mode"));
+	d_printf("<input type=submit name=\"AdvMode\" value=\"%s\">\n", _("Advanced Mode"));
+	d_printf("<input type=submit name=\"DevMode\" value=\"%s\">\n", _("Developer Mode"));
+	d_printf("</p><br>\n");
 }
 
 /****************************************************************************
@@ -778,6 +783,12 @@ static void globals_page(void)
 
 	if ( cgi_variable("ViewMode") )
 		mode = atoi(cgi_variable("ViewMode"));
+	if ( cgi_variable("BasicMode"))
+		mode = 0;
+	if ( cgi_variable("AdvMode"))
+		mode = 1;
+	if ( cgi_variable("DevMode"))
+		mode = 2;
 
 	d_printf("<form name=\"swatform\" method=post action=globals>\n");
 
@@ -852,6 +863,11 @@ static void shares_page(void)
 	d_printf("<table>\n");
 	if ( cgi_variable("ViewMode") )
 		mode = atoi(cgi_variable("ViewMode"));
+	if ( cgi_variable("BasicMode"))
+		mode = 0;
+	if ( cgi_variable("AdvMode"))
+		mode = 1;
+	if ( cgi_variable("DevMode"))
 	ViewModeBoxes( mode );
 	switch ( mode ) {
 		case 0:
-- 
cgit 


From 50548f4ddc4d0ada8d6efe892305be714c670080 Mon Sep 17 00:00:00 2001
From: John Terpstra <jht@samba.org>
Date: Sat, 26 Jul 2003 17:46:47 +0000
Subject: Format tidy up. (This used to be commit
 79d6e72af56838bdc1da437f76c905a47da0c0da)

---
 source3/web/swat.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 074f5138a3..85623ed168 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -519,15 +519,14 @@ static void show_main_buttons(void)
  ****************************************************************************/
 static void ViewModeBoxes(int mode)
 {
-	d_printf("<p>%s\n", _("Configuration View:&nbsp Current View is:&nbsp"));
+	d_printf("<p>%s\n", _("Current View Is:&nbsp \n"));
 	d_printf("<input type=radio name=\"ViewMode\" value=0 %s>Basic\n", (mode == 0) ? "checked" : "");
 	d_printf("<input type=radio name=\"ViewMode\" value=1 %s>Advanced\n", (mode == 1) ? "checked" : "");
 	d_printf("<input type=radio name=\"ViewMode\" value=2 %s>Developer\n", (mode == 2) ? "checked" : "");
-	d_printf("</p><br>\n");
-	d_printf("<p>%s\n", _("Change View To:&nbsp"));
-	d_printf("<input type=submit name=\"BasicMode\" value=\"%s\">\n", _("Basic Mode"));
-	d_printf("<input type=submit name=\"AdvMode\" value=\"%s\">\n", _("Advanced Mode"));
-	d_printf("<input type=submit name=\"DevMode\" value=\"%s\">\n", _("Developer Mode"));
+	d_printf("<br>%s\n", _("Change View To:&nbsp"));
+	d_printf("<input type=submit name=\"BasicMode\" value=\"%s\">\n", _("Basic"));
+	d_printf("<input type=submit name=\"AdvMode\" value=\"%s\">\n", _("Advanced"));
+	d_printf("<input type=submit name=\"DevMode\" value=\"%s\">\n", _("Developer"));
 	d_printf("</p><br>\n");
 }
 
-- 
cgit 


From b4918ea2be3b0295d9c23c503e77b3e69e3f9e76 Mon Sep 17 00:00:00 2001
From: John Terpstra <jht@samba.org>
Date: Sun, 27 Jul 2003 19:49:23 +0000
Subject: Add buttons to Printers View (This used to be commit
 805c33b08902d0d02358b624ef9976dd0bde4909)

---
 source3/web/swat.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 85623ed168..c10890a9bd 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -860,6 +860,7 @@ static void shares_page(void)
 	d_printf("<FORM name=\"swatform\" method=post>\n");
 
 	d_printf("<table>\n");
+
 	if ( cgi_variable("ViewMode") )
 		mode = atoi(cgi_variable("ViewMode"));
 	if ( cgi_variable("BasicMode"))
@@ -867,6 +868,8 @@ static void shares_page(void)
 	if ( cgi_variable("AdvMode"))
 		mode = 1;
 	if ( cgi_variable("DevMode"))
+		mode = 2;
+
 	ViewModeBoxes( mode );
 	switch ( mode ) {
 		case 0:
@@ -1207,6 +1210,13 @@ static void printers_page(void)
 
 	if ( cgi_variable("ViewMode") )
 		mode = atoi(cgi_variable("ViewMode"));
+        if ( cgi_variable("BasicMode"))
+                mode = 0;
+        if ( cgi_variable("AdvMode"))
+                mode = 1;
+        if ( cgi_variable("DevMode"))
+                mode = 2;
+
 	ViewModeBoxes( mode );
 	switch ( mode ) {
 		case 0:
-- 
cgit 


From 8dea1bb9320c412b40a0bf4446d53e4f74162eda Mon Sep 17 00:00:00 2001
From: John Terpstra <jht@samba.org>
Date: Mon, 28 Jul 2003 05:47:15 +0000
Subject: Cleanup of loadparm and swat to correctly display all parameters as
 required. No change to what is displayed has been made at this time. I do
 intend to change the display order before 3.0.0 ships. (This used to be
 commit de7d3063d9e07255da2cc4e67afa50c1e2ddf321)

---
 source3/web/swat.c | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index c10890a9bd..a1c132a088 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -312,9 +312,10 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
 			if (printers & !(parm->flags & FLAG_PRINT)) continue;
 			if (!printers & !(parm->flags & FLAG_SHARE)) continue;
 		}
-		if (parm_filter == FLAG_BASIC) {
+
+		if (!( parm_filter & FLAG_ADVANCED )) {
 			if (!(parm->flags & FLAG_BASIC)) {
-				void *ptr = parm->ptr;
+					void *ptr = parm->ptr;
 
 				if (parm->class == P_LOCAL && snum >= 0) {
 					ptr = lp_local_ptr(snum, ptr);
@@ -355,16 +356,15 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
 					break;
 				case P_SEP:
 					continue;
-				}
+					}
 			}
 			if (printers && !(parm->flags & FLAG_PRINT)) continue;
 		}
-		if (parm_filter == FLAG_WIZARD) {
-			if (!((parm->flags & FLAG_WIZARD))) continue;
-		}
-		if (parm_filter == FLAG_ADVANCED) {
-			if (!((parm->flags & FLAG_ADVANCED))) continue;
-		}
+
+		if ((parm_filter & FLAG_WIZARD) && !(parm->flags & FLAG_WIZARD)) continue;
+		
+		if ((parm_filter & FLAG_ADVANCED) && !(parm->flags & FLAG_ADVANCED)) continue;
+		
 		if (heading && heading != last_heading) {
 			d_printf("<tr><td></td></tr><tr><td><b><u>%s</u></b></td></tr>\n", _(heading));
 			last_heading = heading;
@@ -522,11 +522,9 @@ static void ViewModeBoxes(int mode)
 	d_printf("<p>%s\n", _("Current View Is:&nbsp \n"));
 	d_printf("<input type=radio name=\"ViewMode\" value=0 %s>Basic\n", (mode == 0) ? "checked" : "");
 	d_printf("<input type=radio name=\"ViewMode\" value=1 %s>Advanced\n", (mode == 1) ? "checked" : "");
-	d_printf("<input type=radio name=\"ViewMode\" value=2 %s>Developer\n", (mode == 2) ? "checked" : "");
 	d_printf("<br>%s\n", _("Change View To:&nbsp"));
 	d_printf("<input type=submit name=\"BasicMode\" value=\"%s\">\n", _("Basic"));
 	d_printf("<input type=submit name=\"AdvMode\" value=\"%s\">\n", _("Advanced"));
-	d_printf("<input type=submit name=\"DevMode\" value=\"%s\">\n", _("Developer"));
 	d_printf("</p><br>\n");
 }
 
@@ -786,8 +784,6 @@ static void globals_page(void)
 		mode = 0;
 	if ( cgi_variable("AdvMode"))
 		mode = 1;
-	if ( cgi_variable("DevMode"))
-		mode = 2;
 
 	d_printf("<form name=\"swatform\" method=post action=globals>\n");
 
@@ -799,9 +795,6 @@ static void globals_page(void)
 		case 1:
 			parm_filter = FLAG_ADVANCED;
 			break;
-		case 2:
-			parm_filter = FLAG_DEVELOPER;
-			break;
 	}
 	d_printf("<br>\n");
 	if (have_write_access) {
@@ -867,8 +860,6 @@ static void shares_page(void)
 		mode = 0;
 	if ( cgi_variable("AdvMode"))
 		mode = 1;
-	if ( cgi_variable("DevMode"))
-		mode = 2;
 
 	ViewModeBoxes( mode );
 	switch ( mode ) {
@@ -878,9 +869,6 @@ static void shares_page(void)
 		case 1:
 			parm_filter = FLAG_ADVANCED;
 			break;
-		case 2:
-			parm_filter = FLAG_DEVELOPER;
-			break;
 	}
 	d_printf("<br><tr>\n");
 	d_printf("<td><input type=submit name=selectshare value=\"%s\"></td>\n", _("Choose Share"));
@@ -1214,8 +1202,6 @@ static void printers_page(void)
                 mode = 0;
         if ( cgi_variable("AdvMode"))
                 mode = 1;
-        if ( cgi_variable("DevMode"))
-                mode = 2;
 
 	ViewModeBoxes( mode );
 	switch ( mode ) {
@@ -1225,9 +1211,6 @@ static void printers_page(void)
 		case 1:
 			parm_filter = FLAG_ADVANCED;
 			break;
-		case 2:
-			parm_filter = FLAG_DEVELOPER;
-			break;
 	}
 	d_printf("<table>\n");
 	d_printf("<tr><td><input type=submit name=selectshare value=\"%s\"></td>\n", _("Choose Printer"));
-- 
cgit 


From f3404f3e4acb004281f1609a0088c1eb16e6ba94 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 19 Aug 2003 15:18:27 +0000
Subject: - Update 'preload modules' documention (bug #304) - Fix WINS Server
 List in SWAT (bug #197) - Don't segfault SWAT when adding shares (bug #254)
 (This used to be commit dd43a29504fe2b6f9d13cdb9431347927548fc10)

---
 source3/web/swat.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index a1c132a088..1c892559dd 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -737,7 +737,16 @@ static void wizard_page(void)
 	d_printf("<td><input type=radio name=\"WINSType\" value=0 %s> Not Used&nbsp;</td>", (winstype == 0) ? "checked" : "");
 	d_printf("<td><input type=radio name=\"WINSType\" value=1 %s> Server for client use&nbsp;</td>", (winstype == 1) ? "checked" : "");
 	d_printf("<td><input type=radio name=\"WINSType\" value=2 %s> Client of another WINS server&nbsp;</td>", (winstype == 2) ? "checked" : "");
-	d_printf("<tr><td></td><td></td><td></td><td>Remote WINS Server&nbsp;<input type=text size=\"16\" name=\"WINSAddr\" value=\"%s\"></td></tr>",lp_wins_server_list());
+	d_printf("<tr><td></td><td></td><td></td><td>Remote WINS Server&nbsp;<input type=text size=\"16\" name=\"WINSAddr\" value=\"");
+	
+	/* Print out the list of wins servers */
+	if(lp_wins_server_list()) {
+		int i;
+		const char **wins_servers = lp_wins_server_list();
+		for(i = 0; wins_servers[i]; i++) d_printf("%s ", wins_servers[i]);
+	}
+	
+	d_printf("\"></td></tr>");
 	if (winstype == 3) {
 		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Error: WINS Server Mode and WINS Support both set in smb.conf</font></td></tr>");
 		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Please Select desired WINS mode above.</font></td></tr>");
-- 
cgit 


From 8bfe26b62db2e671b143d93a5428f8fb64a9df05 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 20 Aug 2003 17:13:38 +0000
Subject: metze's autogenerate patch for version.h (This used to be commit
 ae452e51b02672a56adf18aa7a7e365eeaba9272)

---
 source3/web/statuspage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index c579e8f112..21d7e45738 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -327,7 +327,7 @@ void status_page(void)
 
 	d_printf("<table>\n");
 
-	d_printf("<tr><td>%s</td><td>%s</td></tr>", _("version:"), VERSION);
+	d_printf("<tr><td>%s</td><td>%s</td></tr>", _("version:"), SAMBA_VERSION_STRING);
 
 	fflush(stdout);
 	d_printf("<tr><td>%s</td><td>%s</td>\n", _("smbd:"), smbd_running()?_("running"):_("not running"));
-- 
cgit 


From d2596d418feb56af60e6451188fde8164afbd774 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 26 Sep 2003 01:32:20 +0000
Subject: Change title of SWAT globals page from 'Global Variables' to 'Global
 Parameters' to be more consistent with the other pages. (This used to be
 commit 02725d4a3cff5bf0b676c363200795d4cadecca1)

---
 source3/web/swat.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 1c892559dd..f4c12cc02f 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -780,7 +780,7 @@ static void globals_page(void)
 	unsigned int parm_filter = FLAG_BASIC;
 	int mode = 0;
 
-	d_printf("<H2>%s</H2>\n", _("Global Variables"));
+	d_printf("<H2>%s</H2>\n", _("Global Parameters"));
 
 	if (cgi_variable("Commit")) {
 		commit_parameters(GLOBAL_SECTION_SNUM);
@@ -1321,6 +1321,8 @@ static void printers_page(void)
 	iNumNonAutoPrintServices = lp_numservices();
 	load_printers();
 
+	d_printf("hello \" there\n");
+
 	cgi_setup(dyn_SWATDIR, !demo_mode);
 
 	print_header();
-- 
cgit 


From af921c452d2d622984bf32924a6f3c877ea66f8f Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 26 Sep 2003 02:04:03 +0000
Subject: More bug #413.  Fix bad html table row termination in SWAT wizard
 code found by Monyo.  Also remove debugging d_printf() which snuck in the
 last commit. (This used to be commit
 0192f41003af0f8e8c117cf7eb8ad886b8b03749)

---
 source3/web/swat.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index f4c12cc02f..2b2686cc5a 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -737,8 +737,10 @@ static void wizard_page(void)
 	d_printf("<td><input type=radio name=\"WINSType\" value=0 %s> Not Used&nbsp;</td>", (winstype == 0) ? "checked" : "");
 	d_printf("<td><input type=radio name=\"WINSType\" value=1 %s> Server for client use&nbsp;</td>", (winstype == 1) ? "checked" : "");
 	d_printf("<td><input type=radio name=\"WINSType\" value=2 %s> Client of another WINS server&nbsp;</td>", (winstype == 2) ? "checked" : "");
+	d_printf("</tr>\n");	
+
 	d_printf("<tr><td></td><td></td><td></td><td>Remote WINS Server&nbsp;<input type=text size=\"16\" name=\"WINSAddr\" value=\"");
-	
+
 	/* Print out the list of wins servers */
 	if(lp_wins_server_list()) {
 		int i;
@@ -751,7 +753,6 @@ static void wizard_page(void)
 		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Error: WINS Server Mode and WINS Support both set in smb.conf</font></td></tr>");
 		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Please Select desired WINS mode above.</font></td></tr>");
 	}
-	d_printf("</tr>");
 	d_printf("<tr><td><b>%s</b></td>\n","Expose Home Directories:&nbsp;");
 	d_printf("<td><input type=radio name=\"HomeExpo\" value=1 %s> Yes</td>", (have_home == -1) ? "" : "checked ");
 	d_printf("<td><input type=radio name=\"HomeExpo\" value=0 %s> No</td>", (have_home == -1 ) ? "checked" : "");
@@ -1321,8 +1322,6 @@ static void printers_page(void)
 	iNumNonAutoPrintServices = lp_numservices();
 	load_printers();
 
-	d_printf("hello \" there\n");
-
 	cgi_setup(dyn_SWATDIR, !demo_mode);
 
 	print_header();
-- 
cgit 


From 635dff752869d8284386d9c4b84a87840868ecd6 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 3 Oct 2003 01:42:53 +0000
Subject: Moving towards better i18n support in SWAT.  This commit contains a
 bunch of updates to bug 413 from Monyo:

1) pick up proper strings to call msg strings for example to add
  strings in wizard menu in web/swat.c, web/statuspage.c and
  param/loadparm.c.

2) define N_() macro in include/intl.h to pick up some strings
  in param/loadparm.c

3) quote all name and value tag with '"'
  For example in swat.c:720 the "Edit Parameter Values" string is
  displayd only as "Edit" because value tag is not quoted like:
  value=Edit Parameter Values
  These tags should be quoted though it sometimes works well
  without quotation.

4) modify the msg strings not to contain HTML tags or other
  non-message strings. For example
  dprintf(_("test\n")); is modified to dprintf("%s\n", _("test"));
(This used to be commit 351d16956d8125bc689ca84adcb71e0a57d6b7cc)
---
 source3/web/statuspage.c |  22 +++++---
 source3/web/swat.c       | 139 ++++++++++++++++++++++++-----------------------
 2 files changed, 85 insertions(+), 76 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 21d7e45738..9ce9c05b19 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -120,9 +120,9 @@ static void print_share_mode(share_mode_entry *e, char *fname)
 
 	d_printf("<td>");
 	switch (e->share_mode&0xF) {
-	case 0: d_printf("RDONLY     "); break;
-	case 1: d_printf("WRONLY     "); break;
-	case 2: d_printf("RDWR       "); break;
+	case 0: d_printf("%s", _("RDONLY     ")); break;
+	case 1: d_printf("%s", _("WRONLY     ")); break;
+	case 2: d_printf("%s", _("RDWR       ")); break;
 	}
 	d_printf("</td>");
 
@@ -297,6 +297,10 @@ void status_page(void)
 		PID_or_Machine = 1;
 	}
 
+	if (cgi_variable("show_pid_in_col_1")) {
+		PID_or_Machine = 0;
+	}
+
 	tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
 	if (tdb) tdb_traverse(tdb, traverse_fn1, NULL);
  
@@ -307,14 +311,14 @@ void status_page(void)
 	d_printf("<FORM method=post>\n");
 
 	if (!autorefresh) {
-		d_printf("<input type=submit value=\"%s\" name=autorefresh>\n", _("Auto Refresh"));
+		d_printf("<input type=submit value=\"%s\" name=\"autorefresh\">\n", _("Auto Refresh"));
 		d_printf("<br>%s", _("Refresh Interval: "));
-		d_printf("<input type=text size=2 name=\"refresh_interval\" value=%d>\n", 
+		d_printf("<input type=text size=2 name=\"refresh_interval\" value=\"%d\">\n", 
 		       refresh_interval);
 	} else {
-		d_printf("<input type=submit value=\"%s\" name=norefresh>\n", _("Stop Refreshing"));
+		d_printf("<input type=submit value=\"%s\" name=\"norefresh\">\n", _("Stop Refreshing"));
 		d_printf("<br>%s%d\n", _("Refresh Interval: "), refresh_interval);
-		d_printf("<input type=hidden name=refresh value=1>\n");
+		d_printf("<input type=hidden name=\"refresh\" value=\"1\">\n");
 	}
 
 	d_printf("<p>\n");
@@ -418,8 +422,8 @@ void status_page(void)
 
 	if (tdb) tdb_close(tdb);
 
-	d_printf("<br><input type=submit name=\"show_client_in_col_1\" value=\"Show Client in col 1\">\n");
-	d_printf("<input type=submit name=\"show_pid_in_col_1\" value=\"Show PID in col 1\">\n");
+	d_printf("<br><input type=submit name=\"show_client_in_col_1\" value=\"%s\">\n", _("Show Client in col 1"));
+	d_printf("<input type=submit name=\"show_pid_in_col_1\" value=\"%s\">\n", _("Show PID in col 1"));
 
 	d_printf("</FORM>\n");
 
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 2b2686cc5a..f4046b46a2 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -114,7 +114,8 @@ static int include_html(const char *fname)
 	fd = web_open(fname, O_RDONLY, 0);
 
 	if (fd == -1) {
-		d_printf("ERROR: Can't open %s\n", fname);
+		d_printf(_("ERROR: Can't open %s"), fname);
+		d_printf("\n");
 		return 0;
 	}
 
@@ -261,7 +262,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		break;
 
 	case P_INTEGER:
-		d_printf("<input type=text size=8 name=\"parm_%s\" value=%d>", make_parm_name(parm->label), *(int *)ptr);
+		d_printf("<input type=text size=8 name=\"parm_%s\" value=\"%d\">", make_parm_name(parm->label), *(int *)ptr);
 		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%d\'\">",
 			_("Set Default"), make_parm_name(parm->label),(int)(parm->def.ivalue));
 		break;
@@ -404,7 +405,8 @@ static int save_reload(int snum)
 
 	f = sys_fopen(dyn_CONFIGFILE,"w");
 	if (!f) {
-		d_printf("failed to open %s for writing\n", dyn_CONFIGFILE);
+		d_printf(_("failed to open %s for writing"), dyn_CONFIGFILE);
+		d_printf("\n");
 		return 0;
 	}
 
@@ -426,7 +428,8 @@ static int save_reload(int snum)
 	lp_killunused(NULL);
 
 	if (!load_config(False)) {
-                d_printf("Can't reload %s\n", dyn_CONFIGFILE);
+                d_printf(_("Can't reload %s"), dyn_CONFIGFILE);
+		d_printf("\n");
                 return 0;
         }
 	iNumNonAutoPrintServices = lp_numservices();
@@ -495,7 +498,8 @@ static void show_main_buttons(void)
 	char *p;
 	
 	if ((p = cgi_user_name()) && strcmp(p, "root")) {
-		d_printf(_("Logged in as <b>%s</b><p>\n"), p);
+		d_printf(_("Logged in as <b>%s</b>"), p);
+		d_printf("<p>\n");
 	}
 
 	image_link(_("Home"), "", "images/home.gif");
@@ -519,10 +523,10 @@ static void show_main_buttons(void)
  ****************************************************************************/
 static void ViewModeBoxes(int mode)
 {
-	d_printf("<p>%s\n", _("Current View Is:&nbsp \n"));
-	d_printf("<input type=radio name=\"ViewMode\" value=0 %s>Basic\n", (mode == 0) ? "checked" : "");
-	d_printf("<input type=radio name=\"ViewMode\" value=1 %s>Advanced\n", (mode == 1) ? "checked" : "");
-	d_printf("<br>%s\n", _("Change View To:&nbsp"));
+	d_printf("<p>%s:&nbsp;\n", _("Current View Is"));
+	d_printf("<input type=radio name=\"ViewMode\" value=0 %s>%s\n", ((mode == 0) ? "checked" : ""), _("Basic"));
+	d_printf("<input type=radio name=\"ViewMode\" value=1 %s>%s\n", ((mode == 1) ? "checked" : ""), _("Advanced"));
+	d_printf("<br>%s:&nbsp;\n", _("Change View To"));
 	d_printf("<input type=submit name=\"BasicMode\" value=\"%s\">\n", _("Basic"));
 	d_printf("<input type=submit name=\"AdvMode\" value=\"%s\">\n", _("Advanced"));
 	d_printf("</p><br>\n");
@@ -572,7 +576,7 @@ static void wizard_params_page(void)
 	/* Here we first set and commit all the parameters that were selected
  	   in the previous screen. */
 
-	d_printf("<H2>Wizard Parameter Edit Page</H2>\n");
+	d_printf("<H2>%s</H2>\n", _("Wizard Parameter Edit Page"));
 
 	if (cgi_variable("Commit")) {
 		commit_parameters(GLOBAL_SECTION_SNUM);
@@ -601,7 +605,7 @@ static void rewritecfg_file(void)
 {
 	commit_parameters(GLOBAL_SECTION_SNUM);
 	save_reload(0);
-	d_printf("<H2>Note: smb.conf %s</H2>\n", _("file has been read and rewritten"));
+	d_printf("<H2>%s</H2>\n", _("Note: smb.conf file has been read and rewritten"));
 }
 
 /****************************************************************************
@@ -709,37 +713,36 @@ static void wizard_page(void)
 	role = lp_server_role();
 	
 	/* Here we go ... */
-	d_printf("<H2>Samba Configuration Wizard</H2>\n");
+	d_printf("<H2>%s</H2>\n", _("Samba Configuration Wizard"));
 	d_printf("<form method=post action=wizard>\n");
 
 	if (have_write_access) {
-		d_printf(_("The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments.\n"));
-		d_printf(_("The same will happen if you press the commit button."));
-		d_printf("<br><br>");
+		d_printf("%s\n", _("The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."));
+		d_printf("%s", _("The same will happen if you press the commit button."));
+		d_printf("<br><br>\n");
 		d_printf("<center>");
-		d_printf("<input type=submit name=\"Rewrite\" value=%s> &nbsp;&nbsp;",_("Rewrite smb.conf file"));
-		d_printf("<input type=submit name=\"Commit\" value=%s> &nbsp;&nbsp;",_("Commit"));
-		d_printf("<input type=submit name=\"GetWizardParams\" value=%s>", _("Edit Parameter Values"));
-		d_printf("</center>");
+		d_printf("<input type=submit name=\"Rewrite\" value=\"%s\"> &nbsp;&nbsp;",_("Rewrite smb.conf file"));
+		d_printf("<input type=submit name=\"Commit\" value=\"%s\"> &nbsp;&nbsp;",_("Commit"));
+		d_printf("<input type=submit name=\"GetWizardParams\" value=\"%s\">", _("Edit Parameter Values"));
+		d_printf("</center>\n");
 	}
 
 	d_printf("<hr>");
 	d_printf("<center><table border=0>");
-	d_printf("<tr><td><b>%s</b></td>\n", "Server Type:&nbsp;");
-	d_printf("<td><input type=radio name=\"ServerType\" value=0 %s> Stand Alone&nbsp;</td>", (role == ROLE_STANDALONE) ? "checked" : "");
-	d_printf("<td><input type=radio name=\"ServerType\" value=1 %s> Domain Member&nbsp;</td>", (role == ROLE_DOMAIN_MEMBER) ? "checked" : ""); 
-	d_printf("<td><input type=radio name=\"ServerType\" value=2 %s> Domain Controller&nbsp;</td>", (role == ROLE_DOMAIN_PDC) ? "checked" : "");
-	d_printf("</tr>");
+	d_printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Server Type"));
+	d_printf("<td><input type=radio name=\"ServerType\" value=\"0\" %s> %s&nbsp;</td>", ((role == ROLE_STANDALONE) ? "checked" : ""), _("Stand Alone"));
+	d_printf("<td><input type=radio name=\"ServerType\" value=\"1\" %s> %s&nbsp;</td>", ((role == ROLE_DOMAIN_MEMBER) ? "checked" : ""), _("Domain Member")); 
+	d_printf("<td><input type=radio name=\"ServerType\" value=\"2\" %s> %s&nbsp;</td>", ((role == ROLE_DOMAIN_PDC) ? "checked" : ""), _("Domain Controller"));
+	d_printf("</tr>\n");
 	if (role == ROLE_DOMAIN_BDC) {
-		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Unusual Type in smb.conf - Please Select New Mode</font></td></tr>");
+		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Unusual Type in smb.conf - Please Select New Mode"));
 	}
-	d_printf("<tr><td><b>%s</b></td>\n", "Configure WINS As:&nbsp;");
-	d_printf("<td><input type=radio name=\"WINSType\" value=0 %s> Not Used&nbsp;</td>", (winstype == 0) ? "checked" : "");
-	d_printf("<td><input type=radio name=\"WINSType\" value=1 %s> Server for client use&nbsp;</td>", (winstype == 1) ? "checked" : "");
-	d_printf("<td><input type=radio name=\"WINSType\" value=2 %s> Client of another WINS server&nbsp;</td>", (winstype == 2) ? "checked" : "");
-	d_printf("</tr>\n");	
-
-	d_printf("<tr><td></td><td></td><td></td><td>Remote WINS Server&nbsp;<input type=text size=\"16\" name=\"WINSAddr\" value=\"");
+	d_printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Configure WINS As"));
+	d_printf("<td><input type=radio name=\"WINSType\" value=\"0\" %s> %s&nbsp;</td>", ((winstype == 0) ? "checked" : ""), _("Not Used"));
+	d_printf("<td><input type=radio name=\"WINSType\" value=\"1\" %s> %s&nbsp;</td>", ((winstype == 1) ? "checked" : ""), _("Server for client use"));
+	d_printf("<td><input type=radio name=\"WINSType\" value=\"2\" %s> %s&nbsp;</td>", ((winstype == 2) ? "checked" : ""), _("Client of another WINS server"));
+	d_printf("</tr>\n");
+	d_printf("<tr><td></td><td></td><td></td><td>%s&nbsp;<input type=text size=\"16\" name=\"WINSAddr\" value=\"", _("Remote WINS Server"));
 
 	/* Print out the list of wins servers */
 	if(lp_wins_server_list()) {
@@ -748,27 +751,27 @@ static void wizard_page(void)
 		for(i = 0; wins_servers[i]; i++) d_printf("%s ", wins_servers[i]);
 	}
 	
-	d_printf("\"></td></tr>");
+	d_printf("\"></td></tr>\n");
 	if (winstype == 3) {
-		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Error: WINS Server Mode and WINS Support both set in smb.conf</font></td></tr>");
-		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Please Select desired WINS mode above.</font></td></tr>");
+		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Error: WINS Server Mode and WINS Support both set in smb.conf"));
+		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Please Select desired WINS mode above."));
 	}
-	d_printf("<tr><td><b>%s</b></td>\n","Expose Home Directories:&nbsp;");
-	d_printf("<td><input type=radio name=\"HomeExpo\" value=1 %s> Yes</td>", (have_home == -1) ? "" : "checked ");
-	d_printf("<td><input type=radio name=\"HomeExpo\" value=0 %s> No</td>", (have_home == -1 ) ? "checked" : "");
-	d_printf("<td></td></tr>");
+	d_printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Expose Home Directories"));
+	d_printf("<td><input type=radio name=\"HomeExpo\" value=\"1\" %s> Yes</td>", (have_home == -1) ? "" : "checked ");
+	d_printf("<td><input type=radio name=\"HomeExpo\" value=\"0\" %s> No</td>", (have_home == -1 ) ? "checked" : "");
+	d_printf("<td></td></tr>\n");
 	
 	/* Enable this when we are ready ....
-	 * d_printf("<tr><td><b>%s</b></td>\n","Is Print Server:&nbsp;");
-	 * d_printf("<td><input type=radio name=\"PtrSvr\" value=1 %s> Yes</td>");
-	 * d_printf("<td><input type=radio name=\"PtrSvr\" value=0 %s> No</td>");
-	 * d_printf("<td></td></tr>");
+	 * d_printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Is Print Server"));
+	 * d_printf("<td><input type=radio name=\"PtrSvr\" value=\"1\" %s> Yes</td>");
+	 * d_printf("<td><input type=radio name=\"PtrSvr\" value=\"0\" %s> No</td>");
+	 * d_printf("<td></td></tr>\n");
 	 */
 	
 	d_printf("</table></center>");
 	d_printf("<hr>");
 
-	d_printf(_("The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment.\n"));
+	d_printf("%s\n", _("The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."));
 	d_printf("</form>\n");
 }
 
@@ -938,7 +941,7 @@ static BOOL change_password(const char *remote_machine, const char *user_name,
 	pstring msg_str;
 
 	if (demo_mode) {
-		d_printf("%s<p>", _("password change in demo mode rejected\n"));
+		d_printf("%s\n<p>", _("password change in demo mode rejected"));
 		return False;
 	}
 	
@@ -951,7 +954,7 @@ static BOOL change_password(const char *remote_machine, const char *user_name,
 	}
 
 	if(!initialize_password_db(True)) {
-		d_printf("Can't setup password database vectors.\n<p>");
+		d_printf("%s\n<p>", _("Can't setup password database vectors."));
 		return False;
 	}
 	
@@ -977,7 +980,7 @@ static void chg_passwd(void)
 
 	/* Make sure users name has been specified */
 	if (strlen(cgi_variable(SWAT_USER)) == 0) {
-		d_printf("<p>%s", _(" Must specify \"User Name\" \n"));
+		d_printf("<p>%s\n", _(" Must specify \"User Name\" "));
 		return;
 	}
 
@@ -993,26 +996,26 @@ static void chg_passwd(void)
 		 */
 		if (((!am_root()) && (strlen( cgi_variable(OLD_PSWD)) <= 0)) ||
 		    ((cgi_variable(CHG_R_PASSWD_FLAG)) &&  (strlen( cgi_variable(OLD_PSWD)) <= 0))) {
-			d_printf("<p>%s", _(" Must specify \"Old Password\" \n"));
+			d_printf("<p>%s\n", _(" Must specify \"Old Password\" "));
 			return;
 		}
 
 		/* If changing a users password on a remote hosts we have to know what host */
 		if ((cgi_variable(CHG_R_PASSWD_FLAG)) && (strlen( cgi_variable(RHOST)) <= 0)) {
-			d_printf("<p>%s", _(" Must specify \"Remote Machine\" \n"));
+			d_printf("<p>%s\n", _(" Must specify \"Remote Machine\" "));
 			return;
 		}
 
 		/* Make sure new passwords have been specified */
 		if ((strlen( cgi_variable(NEW_PSWD)) <= 0) ||
 		    (strlen( cgi_variable(NEW2_PSWD)) <= 0)) {
-			d_printf("<p>%s", _(" Must specify \"New, and Re-typed Passwords\" \n"));
+			d_printf("<p>%s\n", _(" Must specify \"New, and Re-typed Passwords\" "));
 			return;
 		}
 
 		/* Make sure new passwords was typed correctly twice */
 		if (strcmp(cgi_variable(NEW_PSWD), cgi_variable(NEW2_PSWD)) != 0) {
-			d_printf("<p>%s", _(" Re-typed password didn't match new password\n"));
+			d_printf("<p>%s\n", _(" Re-typed password didn't match new password "));
 			return;
 		}
 	}
@@ -1042,9 +1045,11 @@ static void chg_passwd(void)
 	if(local_flags == 0) {
 		d_printf("<p>");
 		if (rslt == True) {
-			d_printf(_(" The passwd for '%s' has been changed. \n"), cgi_variable(SWAT_USER));
+			d_printf(_(" The passwd for '%s' has been changed."), cgi_variable(SWAT_USER));
+			d_printf("\n");
 		} else {
-			d_printf(_(" The passwd for '%s' has NOT been changed. \n"), cgi_variable(SWAT_USER));
+			d_printf(_(" The passwd for '%s' has NOT been changed."), cgi_variable(SWAT_USER));
+			d_printf("\n");
 		}
 	}
 	
@@ -1077,15 +1082,15 @@ static void passwd_page(void)
 	/* 
 	 * Create all the dialog boxes for data collection
 	 */
-	d_printf("<tr><td>%s</td>\n", _(" User Name : "));
+	d_printf("<tr><td> %s : </td>\n", _("User Name"));
 	d_printf("<td><input type=text size=30 name=%s value=%s></td></tr> \n", SWAT_USER, new_name);
 	if (!am_root()) {
-		d_printf("<tr><td>%s</td>\n", _(" Old Password : "));
+		d_printf("<tr><td> %s : </td>\n", _("Old Password"));
 		d_printf("<td><input type=password size=30 name=%s></td></tr> \n",OLD_PSWD);
 	}
-	d_printf("<tr><td>%s</td>\n", _(" New Password : "));
+	d_printf("<tr><td> %s : </td>\n", _("New Password"));
 	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
-	d_printf("<tr><td>%s</td>\n", _(" Re-type New Password : "));
+	d_printf("<tr><td> %s : </td>\n", _("Re-type New Password"));
 	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
 	d_printf("</table>\n");
 
@@ -1124,15 +1129,15 @@ static void passwd_page(void)
 	/* 
 	 * Create all the dialog boxes for data collection
 	 */
-	d_printf("<tr><td>%s</td>\n", _(" User Name : "));
+	d_printf("<tr><td> %s : </td>\n", _("User Name"));
 	d_printf("<td><input type=text size=30 name=%s value=%s></td></tr>\n",SWAT_USER, new_name);
-	d_printf("<tr><td>%s</td>\n", _(" Old Password : "));
+	d_printf("<tr><td> %s : </td>\n", _("Old Password"));
 	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",OLD_PSWD);
-	d_printf("<tr><td>%s</td>\n", _(" New Password : "));
+	d_printf("<tr><td> %s : </td>\n", _("New Password"));
 	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
-	d_printf("<tr><td>%s</td>\n", _(" Re-type New Password : "));
+	d_printf("<tr><td> %s : </td>\n", _("Re-type New Password"));
 	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
-	d_printf("<tr><td>%s</td>\n", _(" Remote Machine : "));
+	d_printf("<tr><td> %s : </td>\n", _("Remote Machine"));
 	d_printf("<td><input type=text size=30 name=%s></td></tr>\n",RHOST);
 
 	d_printf("</table>");
@@ -1177,7 +1182,7 @@ static void printers_page(void)
         d_printf(_("Printer names marked with [*] in the Choose Printer drop-down box "));
         d_printf(_("are autoloaded printers from "));
         d_printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
-        d_printf(_("Attempting to delete these printers from SWAT will have no effect.\n"));
+        d_printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect."));
 
 	if (cgi_variable("Commit") && snum >= 0) {
 		commit_parameters(snum);
@@ -1223,8 +1228,8 @@ static void printers_page(void)
 			break;
 	}
 	d_printf("<table>\n");
-	d_printf("<tr><td><input type=submit name=selectshare value=\"%s\"></td>\n", _("Choose Printer"));
-	d_printf("<td><select name=share>\n");
+	d_printf("<tr><td><input type=submit name=\"selectshare\" value=\"%s\"></td>\n", _("Choose Printer"));
+	d_printf("<td><select name=\"share\">\n");
 	if (snum < 0 || !lp_print_ok(snum))
 		d_printf("<option value=\" \"> \n");
 	for (i=0;i<lp_numservices();i++) {
@@ -1249,8 +1254,8 @@ static void printers_page(void)
 
 	if (have_write_access) {
 		d_printf("<table>\n");
-		d_printf("<tr><td><input type=submit name=createshare value=\"%s\"></td>\n", _("Create Printer"));
-		d_printf("<td><input type=text size=30 name=newshare></td></tr>\n");
+		d_printf("<tr><td><input type=submit name=\"createshare\" value=\"%s\"></td>\n", _("Create Printer"));
+		d_printf("<td><input type=text size=30 name=\"newshare\"></td></tr>\n");
 		d_printf("</table>");
 	}
 
-- 
cgit 


From da8048b4fa8b60ec3cb3033d19d4a451f259befb Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 21 Oct 2003 14:19:32 +0000
Subject: call initgroups before becomming the user; patch from Fabio Cecchi
 (This used to be commit 5a8dbccd66911642fabb6b8b38fff4477b76c3a1)

---
 source3/web/cgi.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 212c2884b6..8e739cd224 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -342,6 +342,9 @@ static BOOL cgi_handle_authorization(char *line)
 			 * 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 */
-- 
cgit 


From bb0598faf58679a7ad26a1caab8eadb154a07ae2 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 22 Oct 2003 23:38:20 +0000
Subject: Put strcasecmp/strncasecmp on the banned list (except for needed
 calls in iconv.c and nsswitch/). Using them means you're not thinking about
 multibyte at all and I really want to discourage that. Jeremy. (This used to
 be commit d7e35dfb9283d560d0ed2ab231f36ed92767dace)

---
 source3/web/cgi.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 8e739cd224..6778e59656 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! */
-- 
cgit 


From d5573ccde3b5c39eb9a4637d5a9d7a95b66d86e3 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Fri, 7 Nov 2003 09:03:02 +0000
Subject: Simple rename of get_socket_addr to get_peer_addr and get_socket_name
 to get_peer_name. This is to get closer to the getsockname/getpeername system
 functions.

Next step will be the %i macro for the local IP address. I still want to play
%L-games in times of port 445.

Volker
(This used to be commit d7162122eaf5d897e5de51604e431bfbaa20e905)
---
 source3/web/cgi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 6778e59656..49a8fa92de 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -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");
 }
-- 
cgit 


From 11f4893145f94c85b4f1268544a84116d3a38751 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Sat, 22 Nov 2003 04:33:36 +0000
Subject: Ensure that items in a list of strings containing whitespace are
 written out surrounded by single quotes.  This means that both double and
 single quotes are now used to surround strings in smb.conf.  This is a slight
 change from the previous behavior but needed or else things like

    printer admin = +ntadmin, 'VALE\Domain, Admin'

get written to smb.conf by SWAT.
(This used to be commit 5bf91c79d620e34ac71d72c80f74e47754d49dcb)
---
 source3/web/swat.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index f4046b46a2..1faef46e25 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -212,7 +212,11 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		if ((char ***)ptr && *(char ***)ptr && **(char ***)ptr) {
 			char **list = *(char ***)ptr;
 			for (;*list;list++) {
-				d_printf("%s%s", *list, ((*(list+1))?" ":""));
+				/* enclose in quotes if the string contains a space */
+				if ( strchr_m(*list, ' ') ) 
+					d_printf("\'%s\'%s", *list, ((*(list+1))?", ":""));
+				else
+					d_printf("%s%s", *list, ((*(list+1))?", ":""));
 			}
 		}
 		d_printf("\">");
@@ -221,7 +225,11 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		if (parm->def.lvalue) {
 			char **list = (char **)(parm->def.lvalue);
 			for (; *list; list++) {
-				d_printf("%s%s", *list, ((*(list+1))?" ":""));
+				/* enclose in quotes if the string contains a space */
+				if ( strchr_m(*list, ' ') ) 
+					d_printf("\'%s\'%s", *list, ((*(list+1))?", ":""));
+				else
+					d_printf("%s%s", *list, ((*(list+1))?", ":""));
 			}
 		}
 		d_printf("\'\">");
-- 
cgit 


From 8a53eed206a6be996dda5e3555619cdccaf8d2c3 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Sat, 22 Nov 2003 04:47:34 +0000
Subject: fix winbind ping call so that SWAT correctly determines if winbindd
 is running; bug 398 (This used to be commit
 04e37283f230b28f3019bfab3a71dde5e4ae4e23)

---
 source3/web/diagnose.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index efd6d1d0a1..46432c41f8 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -31,11 +31,7 @@ NSS_STATUS winbindd_request(int req_type,
 
 BOOL winbindd_running(void)
 {
-
-	if (winbindd_request(WINBINDD_PING, NULL, NULL))
-		return False;
-
-	return True;
+	return winbind_ping();
 }	
 #endif
 
-- 
cgit 


From 7d9fb45339687de1cbc8a0749353c8dd7c13d870 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Sat, 22 Nov 2003 06:16:01 +0000
Subject: include WWW-Authenticate field in 401 response for bad auth attempt;
 bug 629 (This used to be commit 879d0f15ea260d61c56c5b841065ecb2f5ec26ca)

---
 source3/web/cgi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 49a8fa92de..07e3ee38fb 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -355,7 +355,8 @@ static BOOL cgi_handle_authorization(char *line)
 	}
 	
 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);
-- 
cgit 


From 3b386064911dce7c02e40b5cc7a971f2d4b28185 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 25 Dec 2003 09:37:41 +0000
Subject: Fix bug 916 - do not perform a + -> space substitution for squid URL
 encoded strings, only form input in SWAT.

Andrew Bartlett
(This used to be commit 8d54f5fe0c5689660f37788916b37014754ce23e)
---
 source3/web/cgi.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 07e3ee38fb..8a103fa57f 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -85,6 +85,20 @@ static char *grab_line(FILE *f, int *cl)
 	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)
+**/
+
+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
@@ -130,7 +144,9 @@ void cgi_load_variables(void)
 			    !variables[num_variables].value)
 				continue;
 
+			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
@@ -161,7 +177,9 @@ void cgi_load_variables(void)
 			    !variables[num_variables].value)
 				continue;
 
+			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
-- 
cgit 


From 19cc1a9f202551fdaca39d67d926bb77e32d085c Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 2 Feb 2004 00:08:35 +0000
Subject: remerge andrew's cracklib patch from HEAD and fix a compile warnings
 (This used to be commit b60f6ec30d05e4e5bba9934a416ddc8bc089824f)

---
 source3/web/swat.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 1faef46e25..d1b028836d 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -51,6 +51,13 @@ static int iNumNonAutoPrintServices = 0;
 #define ENABLE_USER_FLAG "enable_user_flag"
 #define RHOST "remote_host"
 
+/* FUNCTION DECLARATIONS */
+
+BOOL remote_password_change(const char *rmachine, const char *username,
+                            const char *old_pw, const char *new_pw,
+                            char *err_str, size_t err_str_len);
+
+
 /****************************************************************************
 ****************************************************************************/
 static int enum_index(int value, const struct enum_list *enumlist)
-- 
cgit 


From 7ca6d16605ef793e317eca48c9ea95e531c248ab Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 2 Feb 2004 20:16:24 +0000
Subject: fix problems with proto.h (This used to be commit
 5a32f9568f128374df98491b43e6f5b299cb656c)

---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index d1b028836d..80160e31f4 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -53,7 +53,7 @@ static int iNumNonAutoPrintServices = 0;
 
 /* FUNCTION DECLARATIONS */
 
-BOOL remote_password_change(const char *rmachine, const char *username,
+ BOOL remote_password_change(const char *rmachine, const char *username,
                             const char *old_pw, const char *new_pw,
                             char *err_str, size_t err_str_len);
 
-- 
cgit 


From ccaf0e7fb11ea5faa752bd6dfddfa3d9fe62b92d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 4 Feb 2004 11:12:25 +0000
Subject: This should be the correct fix for the lack of a prototype for
 remote_password_change().

Sorry for the original bug.

Andrew Bartlett
(This used to be commit 955436a6f6d7c2f580b2c4e1edbb7ee2fe5df858)
---
 source3/web/swat.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 80160e31f4..a67a2f8db0 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -51,12 +51,6 @@ static int iNumNonAutoPrintServices = 0;
 #define ENABLE_USER_FLAG "enable_user_flag"
 #define RHOST "remote_host"
 
-/* FUNCTION DECLARATIONS */
-
- BOOL remote_password_change(const char *rmachine, const char *username,
-                            const char *old_pw, const char *new_pw,
-                            char *err_str, size_t err_str_len);
-
 
 /****************************************************************************
 ****************************************************************************/
-- 
cgit 


From d198c5587774808823aa09e997ff492826738c51 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 8 Feb 2004 08:38:42 +0000
Subject: Make more functions static, and remove duplication in the use of
 functions in lib/smbpasswd.c that were exact duplicates of functions in
 passdb/passdb.c

(These should perhaps be pulled back out to smbpasswd.c, but that can occour
later).

Andrew Bartlett
(This used to be commit fcdc5efb1e245c8fa95cd031f67ec56093b9056e)
---
 source3/web/cgi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 8a103fa57f..aac009893c 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -91,7 +91,7 @@ static char *grab_line(FILE *f, int *cl)
  (This was in rfc1738_unescape(), but that broke the squid helper)
 **/
 
-void plus_to_space_unescape(char *buf)
+static void plus_to_space_unescape(char *buf)
 {
 	char *p=buf;
 
-- 
cgit 


From 37d0cb0b708f7d28e8d2e21cab75abf8dcf4ba83 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sat, 21 Feb 2004 00:28:48 +0000
Subject: printf -> d_printf

Bugzilla #1066.
(This used to be commit 2285ec9737d7d1767e60cf43c3a55f10643371be)
---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index a67a2f8db0..e535106f26 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -198,7 +198,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		ptr = lp_local_ptr(snum, ptr);
 	}
 
-	printf("<tr><td>%s</td><td>", get_parm_translated(stripspaceupper(parm->label), _("Help"), parm->label));
+	d_printf("<tr><td>%s</td><td>", get_parm_translated(stripspaceupper(parm->label), _("Help"), parm->label));
 	switch (parm->type) {
 	case P_CHAR:
 		d_printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",
-- 
cgit 


From 474758956cd73be0b5eea1070f9259608c12a4e6 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 5 Mar 2004 18:37:01 +0000
Subject: BUG 488: fix the 'show client in col 1' button and corrctely
 enumerate active connections (This used to be commit
 d77d38560d1bdc10a58408f449fbc320275bcacc)

---
 source3/web/statuspage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 9ce9c05b19..3d70796830 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -177,7 +177,7 @@ static int traverse_fn2(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 
 	memcpy(&crec, dbuf.dptr, sizeof(crec));
 	
-	if (crec.cnum != -1 || !process_exists(crec.pid) || (crec.pid == smbd_pid))
+	if (crec.cnum == -1 || !process_exists(crec.pid) || (crec.pid == smbd_pid))
 		return 0;
 
 	addPid2Machine (crec.pid, crec.machine);
-- 
cgit 


From e3f5b542707e2328030b9d5eff0836a904eccde5 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 11 Mar 2004 22:48:24 +0000
Subject: Restore the contract on all convert_stringXX() interfaces. Add a
 "allow_bad_conv" boolean parameter that allows broken iconv conversions to
 work. Gets rid of the nasty errno checks in mangle_hash2 and
 check_path_syntax and allows correct return code checking. Jeremy. (This used
 to be commit 7b96765c23637613f079d37566d95d5edd511f05)

---
 source3/web/cgi.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index aac009893c..07b9f52ff7 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -203,13 +203,13 @@ void cgi_load_variables(void)
 
 		convert_string(CH_DISPLAY, CH_UNIX, 
 			       variables[i].name, -1, 
-			       dest, sizeof(dest));
+			       dest, sizeof(dest), True);
 		free(variables[i].name);
 		variables[i].name = strdup(dest);
 
 		convert_string(CH_DISPLAY, CH_UNIX, 
 			       variables[i].value, -1,
-			       dest, sizeof(dest));
+			       dest, sizeof(dest), True);
 		free(variables[i].value);
 		variables[i].value = strdup(dest);
 	}
@@ -336,11 +336,11 @@ static BOOL cgi_handle_authorization(char *line)
 
 	convert_string(CH_DISPLAY, CH_UNIX, 
 		       line, -1, 
-		       user, sizeof(user));
+		       user, sizeof(user), True);
 
 	convert_string(CH_DISPLAY, CH_UNIX, 
 		       p+1, -1, 
-		       user_pass, sizeof(user_pass));
+		       user_pass, sizeof(user_pass), True);
 
 	/*
 	 * Try and get the user from the UNIX password file.
-- 
cgit 


From 931df5850e326ad0639fe317e0ca82e6d820a68e Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 5 Apr 2004 12:19:50 +0000
Subject: r39: * importing .cvsignore files * updateing WHATSNEW with vl's
 change (This used to be commit a7e2730ec4389e0c249886a8bfe1ee14c5abac41)

---
 source3/web/.cvsignore | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 source3/web/.cvsignore

(limited to 'source3/web')

diff --git a/source3/web/.cvsignore b/source3/web/.cvsignore
deleted file mode 100644
index ed29eafc6b..0000000000
--- a/source3/web/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-swat_proto.h
\ No newline at end of file
-- 
cgit 


From 7309594b07c8fc48754c006dd1c1fde3fc3c6b40 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 5 May 2004 14:46:00 +0000
Subject: r492: BUG 483: patch from Michel Gravey <michel.gravey@optogone.com>
 to fix password hash creation in SWAT (This used to be commit
 08fc16d7e694213fa1abf81f1e10989888508697)

---
 source3/web/swat.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index e535106f26..ed53d0d712 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1042,16 +1042,19 @@ static void chg_passwd(void)
 	 */
 
 	local_flags |= (cgi_variable(ADD_USER_FLAG) ? LOCAL_ADD_USER : 0);
+	local_flags |= (cgi_variable(ADD_USER_FLAG) ?  LOCAL_SET_PASSWORD : 0);
+	local_flags |= (cgi_variable(CHG_S_PASSWD_FLAG) ? LOCAL_SET_PASSWORD : 0);
 	local_flags |= (cgi_variable(DELETE_USER_FLAG) ? LOCAL_DELETE_USER : 0);
 	local_flags |= (cgi_variable(ENABLE_USER_FLAG) ? LOCAL_ENABLE_USER : 0);
 	local_flags |= (cgi_variable(DISABLE_USER_FLAG) ? LOCAL_DISABLE_USER : 0);
+	
 
 	rslt = change_password(host,
 			       cgi_variable(SWAT_USER),
 			       cgi_variable(OLD_PSWD), cgi_variable(NEW_PSWD),
 				   local_flags);
 
-	if(local_flags == 0) {
+	if(cgi_variable(CHG_S_PASSWD_FLAG)) {
 		d_printf("<p>");
 		if (rslt == True) {
 			d_printf(_(" The passwd for '%s' has been changed."), cgi_variable(SWAT_USER));
-- 
cgit 


From db1ff9b348a16d769f007362fa57ab89f56d101c Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 16 Aug 2004 15:25:57 +0000
Subject: r1833: patch from James Peach to get swat to look for index.html by
 default when given a trailing directory/ (This used to be commit
 980740da784ce00ad1b388872297b82d4d368044)

---
 source3/web/cgi.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 07b9f52ff7..b1aa8ae754 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -421,18 +421,38 @@ static void cgi_download(char *file)
 		}
 	}
 
-	if (!file_exist(file, &st)) {
+	if (sys_stat(file, &st) != 0) 
+	{
 		cgi_setup_error("404 File Not Found","",
 				"The requested file was not found");
 	}
 
-	fd = web_open(file,O_RDONLY,0);
+	if (S_ISDIR(st.st_mode))
+	{
+		snprintf(buf, sizeof(buf), "%s/index.html", file);
+		if (!file_exist(buf, &st) || !S_ISREG(st.st_mode))
+		{
+			cgi_setup_error("404 File Not Found","",
+					"The requested file was not found");
+		}
+	}
+	else if (S_ISREG(st.st_mode))
+	{
+		snprintf(buf, sizeof(buf), "%s", file);
+	}
+	else
+	{
+		cgi_setup_error("404 File Not Found","",
+				"The requested file was not found");
+	}
+
+	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) {
@@ -554,7 +574,7 @@ 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);
 	}
 
-- 
cgit 


From b2dc329d437603e525609b101ecced7f0c5b19cd Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 1 Oct 2004 22:24:44 +0000
Subject: r2771: Second (and last) part of Swat-i18n-Patch from Björn Jacke
 <bjacke@sernet.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"Do not use display charset for swat output. In HTML we do not care
about the "locale charmap" because HTML code is UTF-8 only now.
Additionally take care that we convert files from statuspage from unix
charset to UTF-8. Thus we have correct HTML output under all
circumstances. We now also convert the share names correctly from unix
encoding to web encoding and vice vera.  "

Guenther
(This used to be commit 6d9f77c2bb95db4939b8ef375e22b188168b70ab)
---
 source3/web/cgi.c        |  12 +-
 source3/web/statuspage.c | 160 +++++++++--------
 source3/web/swat.c       | 457 ++++++++++++++++++++++++-----------------------
 3 files changed, 318 insertions(+), 311 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index b1aa8ae754..93731d1d3f 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -196,18 +196,18 @@ void cgi_load_variables(void)
         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, 
+		convert_string(CH_UTF8, CH_UNIX, 
 			       variables[i].name, -1, 
 			       dest, sizeof(dest), True);
 		free(variables[i].name);
 		variables[i].name = strdup(dest);
 
-		convert_string(CH_DISPLAY, CH_UNIX, 
+		convert_string(CH_UTF8, CH_UNIX, 
 			       variables[i].value, -1,
 			       dest, sizeof(dest), True);
 		free(variables[i].value);
@@ -334,11 +334,11 @@ static BOOL cgi_handle_authorization(char *line)
 	}
 	*p = 0;
 
-	convert_string(CH_DISPLAY, CH_UNIX, 
+	convert_string(CH_UTF8, CH_UNIX, 
 		       line, -1, 
 		       user, sizeof(user), True);
 
-	convert_string(CH_DISPLAY, CH_UNIX, 
+	convert_string(CH_UTF8, CH_UNIX, 
 		       p+1, -1, 
 		       user_pass, sizeof(user_pass), True);
 
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 3d70796830..2c645de248 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -107,42 +107,46 @@ static char *tstring(time_t t)
 
 static void print_share_mode(share_mode_entry *e, char *fname)
 {
-	d_printf("<tr><td>%s</td>",_(mapPid2Machine(e->pid)));
-	d_printf("<td>");
+	char           *utf8_fname;
+
+	printf("<tr><td>%s</td>",_(mapPid2Machine(e->pid)));
+	printf("<td>");
 	switch ((e->share_mode>>4)&0xF) {
-	case DENY_NONE: d_printf("DENY_NONE"); break;
-	case DENY_ALL:  d_printf("DENY_ALL   "); break;
-	case DENY_DOS:  d_printf("DENY_DOS   "); break;
-	case DENY_READ: d_printf("DENY_READ  "); break;
-	case DENY_WRITE:d_printf("DENY_WRITE "); break;
+	case DENY_NONE: printf("DENY_NONE"); break;
+	case DENY_ALL:  printf("DENY_ALL   "); break;
+	case DENY_DOS:  printf("DENY_DOS   "); break;
+	case DENY_READ: printf("DENY_READ  "); break;
+	case DENY_WRITE:printf("DENY_WRITE "); break;
 	}
-	d_printf("</td>");
+	printf("</td>");
 
-	d_printf("<td>");
+	printf("<td>");
 	switch (e->share_mode&0xF) {
-	case 0: d_printf("%s", _("RDONLY     ")); break;
-	case 1: d_printf("%s", _("WRONLY     ")); break;
-	case 2: d_printf("%s", _("RDWR       ")); break;
+	case 0: printf("%s", _("RDONLY     ")); break;
+	case 1: printf("%s", _("WRONLY     ")); break;
+	case 2: printf("%s", _("RDWR       ")); break;
 	}
-	d_printf("</td>");
+	printf("</td>");
 
-	d_printf("<td>");
+	printf("<td>");
 	if((e->op_type & 
 	    (EXCLUSIVE_OPLOCK|BATCH_OPLOCK)) == 
 	   (EXCLUSIVE_OPLOCK|BATCH_OPLOCK))
-		d_printf("EXCLUSIVE+BATCH ");
+		printf("EXCLUSIVE+BATCH ");
 	else if (e->op_type & EXCLUSIVE_OPLOCK)
-		d_printf("EXCLUSIVE       ");
+		printf("EXCLUSIVE       ");
 	else if (e->op_type & BATCH_OPLOCK)
-		d_printf("BATCH           ");
+		printf("BATCH           ");
 	else if (e->op_type & LEVEL_II_OPLOCK)
-		d_printf("LEVEL_II        ");
+		printf("LEVEL_II        ");
 	else
-		d_printf("NONE            ");
-	d_printf("</td>");
+		printf("NONE            ");
+	printf("</td>");
 
-	d_printf("<td>%s</td><td>%s</td></tr>\n",
-	       fname,tstring(e->time.tv_sec));
+	push_utf8_allocate(&utf8_fname, fname);
+	printf("<td>%s</td><td>%s</td></tr>\n",
+	       utf8_fname,tstring(e->time.tv_sec));
+	SAFE_FREE(utf8_fname);
 }
 
 
@@ -182,15 +186,15 @@ static int traverse_fn2(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 
 	addPid2Machine (crec.pid, crec.machine);
 
-	d_printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td>\n",
+	printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td>\n",
 	       (int)crec.pid,
 	       crec.machine,crec.addr,
 	       tstring(crec.start));
 	if (geteuid() == 0) {
-		d_printf("<td><input type=submit value=\"X\" name=\"kill_%d\"></td>\n",
+		printf("<td><input type=submit value=\"X\" name=\"kill_%d\"></td>\n",
 		       (int)crec.pid);
 	}
-	d_printf("</tr>\n");
+	printf("</tr>\n");
 
 	return 0;
 }
@@ -208,7 +212,7 @@ static int traverse_fn3(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 	if (crec.cnum == -1 || !process_exists(crec.pid))
 		return 0;
 
-	d_printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td></tr>\n",
+	printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td></tr>\n",
 	       crec.name,uidtoname(crec.uid),
 	       gidtoname(crec.gid),(int)crec.pid,
 	       crec.machine,
@@ -306,22 +310,22 @@ void status_page(void)
  
 	initPid2Machine ();
 
-	d_printf("<H2>%s</H2>\n", _("Server Status"));
+	printf("<H2>%s</H2>\n", _("Server Status"));
 
-	d_printf("<FORM method=post>\n");
+	printf("<FORM method=post>\n");
 
 	if (!autorefresh) {
-		d_printf("<input type=submit value=\"%s\" name=\"autorefresh\">\n", _("Auto Refresh"));
-		d_printf("<br>%s", _("Refresh Interval: "));
-		d_printf("<input type=text size=2 name=\"refresh_interval\" value=\"%d\">\n", 
+		printf("<input type=submit value=\"%s\" name=\"autorefresh\">\n", _("Auto Refresh"));
+		printf("<br>%s", _("Refresh Interval: "));
+		printf("<input type=text size=2 name=\"refresh_interval\" value=\"%d\">\n", 
 		       refresh_interval);
 	} else {
-		d_printf("<input type=submit value=\"%s\" name=\"norefresh\">\n", _("Stop Refreshing"));
-		d_printf("<br>%s%d\n", _("Refresh Interval: "), refresh_interval);
-		d_printf("<input type=hidden name=\"refresh\" value=\"1\">\n");
+		printf("<input type=submit value=\"%s\" name=\"norefresh\">\n", _("Stop Refreshing"));
+		printf("<br>%s%d\n", _("Refresh Interval: "), refresh_interval);
+		printf("<input type=hidden name=\"refresh\" value=\"1\">\n");
 	}
 
-	d_printf("<p>\n");
+	printf("<p>\n");
 
 	if (!tdb) {
 		/* open failure either means no connections have been
@@ -329,113 +333,113 @@ void status_page(void)
 	}
 
 
-	d_printf("<table>\n");
+	printf("<table>\n");
 
-	d_printf("<tr><td>%s</td><td>%s</td></tr>", _("version:"), SAMBA_VERSION_STRING);
+	printf("<tr><td>%s</td><td>%s</td></tr>", _("version:"), SAMBA_VERSION_STRING);
 
 	fflush(stdout);
-	d_printf("<tr><td>%s</td><td>%s</td>\n", _("smbd:"), smbd_running()?_("running"):_("not running"));
+	printf("<tr><td>%s</td><td>%s</td>\n", _("smbd:"), smbd_running()?_("running"):_("not running"));
 	if (geteuid() == 0) {
 	    if (smbd_running()) {
 		nr_running++;
-		d_printf("<td><input type=submit name=\"smbd_stop\" value=\"%s\"></td>\n", _("Stop smbd"));
+		printf("<td><input type=submit name=\"smbd_stop\" value=\"%s\"></td>\n", _("Stop smbd"));
 	    } else {
-		d_printf("<td><input type=submit name=\"smbd_start\" value=\"%s\"></td>\n", _("Start smbd"));
+		printf("<td><input type=submit name=\"smbd_start\" value=\"%s\"></td>\n", _("Start smbd"));
 	    }
-	    d_printf("<td><input type=submit name=\"smbd_restart\" value=\"%s\"></td>\n", _("Restart smbd"));
+	    printf("<td><input type=submit name=\"smbd_restart\" value=\"%s\"></td>\n", _("Restart smbd"));
 	}
-	d_printf("</tr>\n");
+	printf("</tr>\n");
 
 	fflush(stdout);
-	d_printf("<tr><td>%s</td><td>%s</td>\n", _("nmbd:"), nmbd_running()?_("running"):_("not running"));
+	printf("<tr><td>%s</td><td>%s</td>\n", _("nmbd:"), nmbd_running()?_("running"):_("not running"));
 	if (geteuid() == 0) {
 	    if (nmbd_running()) {
 		nr_running++;
-		d_printf("<td><input type=submit name=\"nmbd_stop\" value=\"%s\"></td>\n", _("Stop nmbd"));
+		printf("<td><input type=submit name=\"nmbd_stop\" value=\"%s\"></td>\n", _("Stop nmbd"));
 	    } else {
-		d_printf("<td><input type=submit name=\"nmbd_start\" value=\"%s\"></td>\n", _("Start nmbd"));
+		printf("<td><input type=submit name=\"nmbd_start\" value=\"%s\"></td>\n", _("Start nmbd"));
 	    }
-	    d_printf("<td><input type=submit name=\"nmbd_restart\" value=\"%s\"></td>\n", _("Restart nmbd"));    
+	    printf("<td><input type=submit name=\"nmbd_restart\" value=\"%s\"></td>\n", _("Restart nmbd"));    
 	}
-	d_printf("</tr>\n");
+	printf("</tr>\n");
 
 #ifdef WITH_WINBIND
 	fflush(stdout);
-	d_printf("<tr><td>%s</td><td>%s</td>\n", _("winbindd:"), winbindd_running()?_("running"):_("not running"));
+	printf("<tr><td>%s</td><td>%s</td>\n", _("winbindd:"), winbindd_running()?_("running"):_("not running"));
 	if (geteuid() == 0) {
 	    if (winbindd_running()) {
 		nr_running++;
-		d_printf("<td><input type=submit name=\"winbindd_stop\" value=\"%s\"></td>\n", _("Stop winbindd"));
+		printf("<td><input type=submit name=\"winbindd_stop\" value=\"%s\"></td>\n", _("Stop winbindd"));
 	    } else {
-		d_printf("<td><input type=submit name=\"winbindd_start\" value=\"%s\"></td>\n", _("Start winbindd"));
+		printf("<td><input type=submit name=\"winbindd_start\" value=\"%s\"></td>\n", _("Start winbindd"));
 	    }
-	    d_printf("<td><input type=submit name=\"winbindd_restart\" value=\"%s\"></td>\n", _("Restart winbindd"));
+	    printf("<td><input type=submit name=\"winbindd_restart\" value=\"%s\"></td>\n", _("Restart winbindd"));
 	}
-	d_printf("</tr>\n");
+	printf("</tr>\n");
 #endif
 
 	if (geteuid() == 0) {
-	    d_printf("<tr><td></td><td></td>\n");
+	    printf("<tr><td></td><td></td>\n");
 	    if (nr_running >= 1) {
 	        /* stop, restart all */
-		d_printf("<td><input type=submit name=\"all_stop\" value=\"%s\"></td>\n", _("Stop All"));
-		d_printf("<td><input type=submit name=\"all_restart\" value=\"%s\"></td>\n", _("Restart All"));
+		printf("<td><input type=submit name=\"all_stop\" value=\"%s\"></td>\n", _("Stop All"));
+		printf("<td><input type=submit name=\"all_restart\" value=\"%s\"></td>\n", _("Restart All"));
 	    }
 	    else if (nr_running == 0) {
 	    	/* start all */
-		d_printf("<td><input type=submit name=\"all_start\" value=\"%s\"></td>\n", _("Start All"));
+		printf("<td><input type=submit name=\"all_start\" value=\"%s\"></td>\n", _("Start All"));
 	    }
-	    d_printf("</tr>\n");
+	    printf("</tr>\n");
 	}
-	d_printf("</table>\n");
+	printf("</table>\n");
 	fflush(stdout);
 
-	d_printf("<p><h3>%s</h3>\n", _("Active Connections"));
-	d_printf("<table border=1>\n");
-	d_printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th>\n", _("PID"), _("Client"), _("IP address"), _("Date"));
+	printf("<p><h3>%s</h3>\n", _("Active Connections"));
+	printf("<table border=1>\n");
+	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th>\n", _("PID"), _("Client"), _("IP address"), _("Date"));
 	if (geteuid() == 0) {
-		d_printf("<th>%s</th>\n", _("Kill"));
+		printf("<th>%s</th>\n", _("Kill"));
 	}
-	d_printf("</tr>\n");
+	printf("</tr>\n");
 
 	if (tdb) tdb_traverse(tdb, traverse_fn2, NULL);
 
-	d_printf("</table><p>\n");
+	printf("</table><p>\n");
 
-	d_printf("<p><h3>%s</h3>\n", _("Active Shares"));
-	d_printf("<table border=1>\n");
-	d_printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n\n",
+	printf("<p><h3>%s</h3>\n", _("Active Shares"));
+	printf("<table border=1>\n");
+	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n\n",
 		_("Share"), _("User"), _("Group"), _("PID"), _("Client"), _("Date"));
 
 	if (tdb) tdb_traverse(tdb, traverse_fn3, NULL);
 
-	d_printf("</table><p>\n");
+	printf("</table><p>\n");
 
-	d_printf("<h3>%s</h3>\n", _("Open Files"));
-	d_printf("<table border=1>\n");
-	d_printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n", _("PID"), _("Sharing"), _("R/W"), _("Oplock"), _("File"), _("Date"));
+	printf("<h3>%s</h3>\n", _("Open Files"));
+	printf("<table border=1>\n");
+	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n", _("PID"), _("Sharing"), _("R/W"), _("Oplock"), _("File"), _("Date"));
 
 	locking_init(1);
 	share_mode_forall(print_share_mode);
 	locking_end();
-	d_printf("</table>\n");
+	printf("</table>\n");
 
 	if (tdb) tdb_close(tdb);
 
-	d_printf("<br><input type=submit name=\"show_client_in_col_1\" value=\"%s\">\n", _("Show Client in col 1"));
-	d_printf("<input type=submit name=\"show_pid_in_col_1\" value=\"%s\">\n", _("Show PID in col 1"));
+	printf("<br><input type=submit name=\"show_client_in_col_1\" value=\"%s\">\n", _("Show Client in col 1"));
+	printf("<input type=submit name=\"show_pid_in_col_1\" value=\"%s\">\n", _("Show PID in col 1"));
 
-	d_printf("</FORM>\n");
+	printf("</FORM>\n");
 
 	if (autorefresh) {
 		/* this little JavaScript allows for automatic refresh
                    of the page. There are other methods but this seems
                    to be the best alternative */
-		d_printf("<script language=\"JavaScript\">\n");
-		d_printf("<!--\nsetTimeout('window.location.replace(\"%s/status?refresh_interval=%d&refresh=1\")', %d)\n", 
+		printf("<script language=\"JavaScript\">\n");
+		printf("<!--\nsetTimeout('window.location.replace(\"%s/status?refresh_interval=%d&refresh=1\")', %d)\n", 
 		       cgi_baseurl(),
 		       refresh_interval,
 		       refresh_interval*1000);
-		d_printf("//-->\n</script>\n");
+		printf("//-->\n</script>\n");
 	}
 }
diff --git a/source3/web/swat.c b/source3/web/swat.c
index ed53d0d712..40f9f05991 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -115,8 +115,8 @@ static int include_html(const char *fname)
 	fd = web_open(fname, O_RDONLY, 0);
 
 	if (fd == -1) {
-		d_printf(_("ERROR: Can't open %s"), fname);
-		d_printf("\n");
+		printf(_("ERROR: Can't open %s"), fname);
+		printf("\n");
 		return 0;
 	}
 
@@ -134,13 +134,13 @@ static int include_html(const char *fname)
 static void print_header(void)
 {
 	if (!cgi_waspost()) {
-		d_printf("Expires: 0\r\n");
+		printf("Expires: 0\r\n");
 	}
-	d_printf("Content-type: text/html\r\n\r\n");
+	printf("Content-type: text/html\r\n\r\n");
 
 	if (!include_html("include/header.html")) {
-		d_printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
-		d_printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"/swat/images/background.jpg\">\n\n");
+		printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");
+		printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"/swat/images/background.jpg\">\n\n");
 	}
 }
 
@@ -182,7 +182,7 @@ static const char* get_parm_translated(
 static void print_footer(void)
 {
 	if (!include_html("include/footer.html")) {
-		d_printf("\n</BODY>\n</HTML>\n");
+		printf("\n</BODY>\n</HTML>\n");
 	}
 }
 
@@ -198,106 +198,106 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		ptr = lp_local_ptr(snum, ptr);
 	}
 
-	d_printf("<tr><td>%s</td><td>", get_parm_translated(stripspaceupper(parm->label), _("Help"), parm->label));
+	printf("<tr><td>%s</td><td>", get_parm_translated(stripspaceupper(parm->label), _("Help"), parm->label));
 	switch (parm->type) {
 	case P_CHAR:
-		d_printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",
+		printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",
 		       make_parm_name(parm->label), *(char *)ptr);
-		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%c\'\">",
+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%c\'\">",
 			_("Set Default"), make_parm_name(parm->label),(char)(parm->def.cvalue));
 		break;
 
 	case P_LIST:
-		d_printf("<input type=text size=40 name=\"parm_%s\" value=\"",
+		printf("<input type=text size=40 name=\"parm_%s\" value=\"",
 			make_parm_name(parm->label));
 		if ((char ***)ptr && *(char ***)ptr && **(char ***)ptr) {
 			char **list = *(char ***)ptr;
 			for (;*list;list++) {
 				/* enclose in quotes if the string contains a space */
 				if ( strchr_m(*list, ' ') ) 
-					d_printf("\'%s\'%s", *list, ((*(list+1))?", ":""));
+					printf("\'%s\'%s", *list, ((*(list+1))?", ":""));
 				else
-					d_printf("%s%s", *list, ((*(list+1))?", ":""));
+					printf("%s%s", *list, ((*(list+1))?", ":""));
 			}
 		}
-		d_printf("\">");
-		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'",
+		printf("\">");
+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'",
 			_("Set Default"), make_parm_name(parm->label));
 		if (parm->def.lvalue) {
 			char **list = (char **)(parm->def.lvalue);
 			for (; *list; list++) {
 				/* enclose in quotes if the string contains a space */
 				if ( strchr_m(*list, ' ') ) 
-					d_printf("\'%s\'%s", *list, ((*(list+1))?", ":""));
+					printf("\'%s\'%s", *list, ((*(list+1))?", ":""));
 				else
-					d_printf("%s%s", *list, ((*(list+1))?", ":""));
+					printf("%s%s", *list, ((*(list+1))?", ":""));
 			}
 		}
-		d_printf("\'\">");
+		printf("\'\">");
 		break;
 
 	case P_STRING:
 	case P_USTRING:
-		d_printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
+		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
 		       make_parm_name(parm->label), *(char **)ptr);
-		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
 			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
 		break;
 
 	case P_GSTRING:
 	case P_UGSTRING:
-		d_printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
+		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
 		       make_parm_name(parm->label), (char *)ptr);
-		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
 			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
 		break;
 
 	case P_BOOL:
-		d_printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
-		d_printf("<option %s>Yes", (*(BOOL *)ptr)?"selected":"");
-		d_printf("<option %s>No", (*(BOOL *)ptr)?"":"selected");
-		d_printf("</select>");
-		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
+		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
+		printf("<option %s>Yes", (*(BOOL *)ptr)?"selected":"");
+		printf("<option %s>No", (*(BOOL *)ptr)?"":"selected");
+		printf("</select>");
+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
 			_("Set Default"), make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?0:1);
 		break;
 
 	case P_BOOLREV:
-		d_printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
-		d_printf("<option %s>Yes", (*(BOOL *)ptr)?"":"selected");
-		d_printf("<option %s>No", (*(BOOL *)ptr)?"selected":"");
-		d_printf("</select>");
-		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
+		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
+		printf("<option %s>Yes", (*(BOOL *)ptr)?"":"selected");
+		printf("<option %s>No", (*(BOOL *)ptr)?"selected":"");
+		printf("</select>");
+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
 			_("Set Default"), make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?1:0);
 		break;
 
 	case P_INTEGER:
-		d_printf("<input type=text size=8 name=\"parm_%s\" value=\"%d\">", make_parm_name(parm->label), *(int *)ptr);
-		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%d\'\">",
+		printf("<input type=text size=8 name=\"parm_%s\" value=\"%d\">", make_parm_name(parm->label), *(int *)ptr);
+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%d\'\">",
 			_("Set Default"), make_parm_name(parm->label),(int)(parm->def.ivalue));
 		break;
 
 	case P_OCTAL:
-		d_printf("<input type=text size=8 name=\"parm_%s\" value=%s>", make_parm_name(parm->label), octal_string(*(int *)ptr));
-		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+		printf("<input type=text size=8 name=\"parm_%s\" value=%s>", make_parm_name(parm->label), octal_string(*(int *)ptr));
+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
 		       _("Set Default"), make_parm_name(parm->label),
 		       octal_string((int)(parm->def.ivalue)));
 		break;
 
 	case P_ENUM:
-		d_printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
+		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
 		for (i=0;parm->enum_list[i].name;i++) {
 			if (i == 0 || parm->enum_list[i].value != parm->enum_list[i-1].value) {
-				d_printf("<option %s>%s",(*(int *)ptr)==parm->enum_list[i].value?"selected":"",parm->enum_list[i].name);
+				printf("<option %s>%s",(*(int *)ptr)==parm->enum_list[i].value?"selected":"",parm->enum_list[i].name);
 			}
 		}
-		d_printf("</select>");
-		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
+		printf("</select>");
+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
 			_("Set Default"), make_parm_name(parm->label),enum_index((int)(parm->def.ivalue),parm->enum_list));
 		break;
 	case P_SEP:
 		break;
 	}
-	d_printf("</td></tr>\n");
+	printf("</td></tr>\n");
 }
 
 /****************************************************************************
@@ -376,7 +376,7 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
 		if ((parm_filter & FLAG_ADVANCED) && !(parm->flags & FLAG_ADVANCED)) continue;
 		
 		if (heading && heading != last_heading) {
-			d_printf("<tr><td></td></tr><tr><td><b><u>%s</u></b></td></tr>\n", _(heading));
+			printf("<tr><td></td></tr><tr><td><b><u>%s</u></b></td></tr>\n", _(heading));
 			last_heading = heading;
 		}
 		show_parameter(snum, parm);
@@ -414,8 +414,8 @@ static int save_reload(int snum)
 
 	f = sys_fopen(dyn_CONFIGFILE,"w");
 	if (!f) {
-		d_printf(_("failed to open %s for writing"), dyn_CONFIGFILE);
-		d_printf("\n");
+		printf(_("failed to open %s for writing"), dyn_CONFIGFILE);
+		printf("\n");
 		return 0;
 	}
 
@@ -437,8 +437,8 @@ static int save_reload(int snum)
 	lp_killunused(NULL);
 
 	if (!load_config(False)) {
-                d_printf(_("Can't reload %s"), dyn_CONFIGFILE);
-		d_printf("\n");
+                printf(_("Can't reload %s"), dyn_CONFIGFILE);
+		printf("\n");
                 return 0;
         }
 	iNumNonAutoPrintServices = lp_numservices();
@@ -494,7 +494,7 @@ static void commit_parameters(int snum)
 ****************************************************************************/
 static void image_link(const char *name, const char *hlink, const char *src)
 {
-	d_printf("<A HREF=\"%s/%s\"><img border=\"0\" src=\"/swat/%s\" alt=\"%s\"></A>\n", 
+	printf("<A HREF=\"%s/%s\"><img border=\"0\" src=\"/swat/%s\" alt=\"%s\"></A>\n", 
 	       cgi_baseurl(), hlink, src, name);
 }
 
@@ -507,8 +507,8 @@ static void show_main_buttons(void)
 	char *p;
 	
 	if ((p = cgi_user_name()) && strcmp(p, "root")) {
-		d_printf(_("Logged in as <b>%s</b>"), p);
-		d_printf("<p>\n");
+		printf(_("Logged in as <b>%s</b>"), p);
+		printf("<p>\n");
 	}
 
 	image_link(_("Home"), "", "images/home.gif");
@@ -524,7 +524,7 @@ static void show_main_buttons(void)
 	}
 	image_link(_("Password Management"), "passwd", "images/passwd.gif");
 
-	d_printf("<HR>\n");
+	printf("<HR>\n");
 }
 
 /****************************************************************************
@@ -532,13 +532,13 @@ static void show_main_buttons(void)
  ****************************************************************************/
 static void ViewModeBoxes(int mode)
 {
-	d_printf("<p>%s:&nbsp;\n", _("Current View Is"));
-	d_printf("<input type=radio name=\"ViewMode\" value=0 %s>%s\n", ((mode == 0) ? "checked" : ""), _("Basic"));
-	d_printf("<input type=radio name=\"ViewMode\" value=1 %s>%s\n", ((mode == 1) ? "checked" : ""), _("Advanced"));
-	d_printf("<br>%s:&nbsp;\n", _("Change View To"));
-	d_printf("<input type=submit name=\"BasicMode\" value=\"%s\">\n", _("Basic"));
-	d_printf("<input type=submit name=\"AdvMode\" value=\"%s\">\n", _("Advanced"));
-	d_printf("</p><br>\n");
+	printf("<p>%s:&nbsp;\n", _("Current View Is"));
+	printf("<input type=radio name=\"ViewMode\" value=0 %s>%s\n", ((mode == 0) ? "checked" : ""), _("Basic"));
+	printf("<input type=radio name=\"ViewMode\" value=1 %s>%s\n", ((mode == 1) ? "checked" : ""), _("Advanced"));
+	printf("<br>%s:&nbsp;\n", _("Change View To"));
+	printf("<input type=submit name=\"BasicMode\" value=\"%s\">\n", _("Basic"));
+	printf("<input type=submit name=\"AdvMode\" value=\"%s\">\n", _("Advanced"));
+	printf("</p><br>\n");
 }
 
 /****************************************************************************
@@ -560,19 +560,19 @@ static void viewconfig_page(void)
 		full_view = 1;
 	}
 
-	d_printf("<H2>%s</H2>\n", _("Current Config"));
-	d_printf("<form method=post>\n");
+	printf("<H2>%s</H2>\n", _("Current Config"));
+	printf("<form method=post>\n");
 
 	if (full_view) {
-		d_printf("<input type=submit name=\"normal_view\" value=\"%s\">\n", _("Normal View"));
+		printf("<input type=submit name=\"normal_view\" value=\"%s\">\n", _("Normal View"));
 	} else {
-		d_printf("<input type=submit name=\"full_view\" value=\"%s\">\n", _("Full View"));
+		printf("<input type=submit name=\"full_view\" value=\"%s\">\n", _("Full View"));
 	}
 
-	d_printf("<p><pre>");
+	printf("<p><pre>");
 	write_config(stdout, full_view);
-	d_printf("</pre>");
-	d_printf("</form>\n");
+	printf("</pre>");
+	printf("</form>\n");
 }
 
 /****************************************************************************
@@ -585,26 +585,26 @@ static void wizard_params_page(void)
 	/* Here we first set and commit all the parameters that were selected
  	   in the previous screen. */
 
-	d_printf("<H2>%s</H2>\n", _("Wizard Parameter Edit Page"));
+	printf("<H2>%s</H2>\n", _("Wizard Parameter Edit Page"));
 
 	if (cgi_variable("Commit")) {
 		commit_parameters(GLOBAL_SECTION_SNUM);
 		save_reload(0);
 	}
 
-	d_printf("<form name=\"swatform\" method=post action=wizard_params>\n");
+	printf("<form name=\"swatform\" method=post action=wizard_params>\n");
 
 	if (have_write_access) {
-		d_printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
+		printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n");
 	}
 
-	d_printf("<input type=reset name=\"Reset Values\" value=\"Reset\">\n");
-	d_printf("<p>\n");
+	printf("<input type=reset name=\"Reset Values\" value=\"Reset\">\n");
+	printf("<p>\n");
 	
-	d_printf("<table>\n");
+	printf("<table>\n");
 	show_parameters(GLOBAL_SECTION_SNUM, 1, parm_filter, 0);
-	d_printf("</table>\n");
-	d_printf("</form>\n");
+	printf("</table>\n");
+	printf("</form>\n");
 }
 
 /****************************************************************************
@@ -614,7 +614,7 @@ static void rewritecfg_file(void)
 {
 	commit_parameters(GLOBAL_SECTION_SNUM);
 	save_reload(0);
-	d_printf("<H2>%s</H2>\n", _("Note: smb.conf file has been read and rewritten"));
+	printf("<H2>%s</H2>\n", _("Note: smb.conf file has been read and rewritten"));
 }
 
 /****************************************************************************
@@ -722,66 +722,66 @@ static void wizard_page(void)
 	role = lp_server_role();
 	
 	/* Here we go ... */
-	d_printf("<H2>%s</H2>\n", _("Samba Configuration Wizard"));
-	d_printf("<form method=post action=wizard>\n");
+	printf("<H2>%s</H2>\n", _("Samba Configuration Wizard"));
+	printf("<form method=post action=wizard>\n");
 
 	if (have_write_access) {
-		d_printf("%s\n", _("The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."));
-		d_printf("%s", _("The same will happen if you press the commit button."));
-		d_printf("<br><br>\n");
-		d_printf("<center>");
-		d_printf("<input type=submit name=\"Rewrite\" value=\"%s\"> &nbsp;&nbsp;",_("Rewrite smb.conf file"));
-		d_printf("<input type=submit name=\"Commit\" value=\"%s\"> &nbsp;&nbsp;",_("Commit"));
-		d_printf("<input type=submit name=\"GetWizardParams\" value=\"%s\">", _("Edit Parameter Values"));
-		d_printf("</center>\n");
-	}
-
-	d_printf("<hr>");
-	d_printf("<center><table border=0>");
-	d_printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Server Type"));
-	d_printf("<td><input type=radio name=\"ServerType\" value=\"0\" %s> %s&nbsp;</td>", ((role == ROLE_STANDALONE) ? "checked" : ""), _("Stand Alone"));
-	d_printf("<td><input type=radio name=\"ServerType\" value=\"1\" %s> %s&nbsp;</td>", ((role == ROLE_DOMAIN_MEMBER) ? "checked" : ""), _("Domain Member")); 
-	d_printf("<td><input type=radio name=\"ServerType\" value=\"2\" %s> %s&nbsp;</td>", ((role == ROLE_DOMAIN_PDC) ? "checked" : ""), _("Domain Controller"));
-	d_printf("</tr>\n");
+		printf("%s\n", _("The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."));
+		printf("%s", _("The same will happen if you press the commit button."));
+		printf("<br><br>\n");
+		printf("<center>");
+		printf("<input type=submit name=\"Rewrite\" value=\"%s\"> &nbsp;&nbsp;",_("Rewrite smb.conf file"));
+		printf("<input type=submit name=\"Commit\" value=\"%s\"> &nbsp;&nbsp;",_("Commit"));
+		printf("<input type=submit name=\"GetWizardParams\" value=\"%s\">", _("Edit Parameter Values"));
+		printf("</center>\n");
+	}
+
+	printf("<hr>");
+	printf("<center><table border=0>");
+	printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Server Type"));
+	printf("<td><input type=radio name=\"ServerType\" value=\"0\" %s> %s&nbsp;</td>", ((role == ROLE_STANDALONE) ? "checked" : ""), _("Stand Alone"));
+	printf("<td><input type=radio name=\"ServerType\" value=\"1\" %s> %s&nbsp;</td>", ((role == ROLE_DOMAIN_MEMBER) ? "checked" : ""), _("Domain Member")); 
+	printf("<td><input type=radio name=\"ServerType\" value=\"2\" %s> %s&nbsp;</td>", ((role == ROLE_DOMAIN_PDC) ? "checked" : ""), _("Domain Controller"));
+	printf("</tr>\n");
 	if (role == ROLE_DOMAIN_BDC) {
-		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Unusual Type in smb.conf - Please Select New Mode"));
+		printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Unusual Type in smb.conf - Please Select New Mode"));
 	}
-	d_printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Configure WINS As"));
-	d_printf("<td><input type=radio name=\"WINSType\" value=\"0\" %s> %s&nbsp;</td>", ((winstype == 0) ? "checked" : ""), _("Not Used"));
-	d_printf("<td><input type=radio name=\"WINSType\" value=\"1\" %s> %s&nbsp;</td>", ((winstype == 1) ? "checked" : ""), _("Server for client use"));
-	d_printf("<td><input type=radio name=\"WINSType\" value=\"2\" %s> %s&nbsp;</td>", ((winstype == 2) ? "checked" : ""), _("Client of another WINS server"));
-	d_printf("</tr>\n");
-	d_printf("<tr><td></td><td></td><td></td><td>%s&nbsp;<input type=text size=\"16\" name=\"WINSAddr\" value=\"", _("Remote WINS Server"));
+	printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Configure WINS As"));
+	printf("<td><input type=radio name=\"WINSType\" value=\"0\" %s> %s&nbsp;</td>", ((winstype == 0) ? "checked" : ""), _("Not Used"));
+	printf("<td><input type=radio name=\"WINSType\" value=\"1\" %s> %s&nbsp;</td>", ((winstype == 1) ? "checked" : ""), _("Server for client use"));
+	printf("<td><input type=radio name=\"WINSType\" value=\"2\" %s> %s&nbsp;</td>", ((winstype == 2) ? "checked" : ""), _("Client of another WINS server"));
+	printf("</tr>\n");
+	printf("<tr><td></td><td></td><td></td><td>%s&nbsp;<input type=text size=\"16\" name=\"WINSAddr\" value=\"", _("Remote WINS Server"));
 
 	/* Print out the list of wins servers */
 	if(lp_wins_server_list()) {
 		int i;
 		const char **wins_servers = lp_wins_server_list();
-		for(i = 0; wins_servers[i]; i++) d_printf("%s ", wins_servers[i]);
+		for(i = 0; wins_servers[i]; i++) printf("%s ", wins_servers[i]);
 	}
 	
-	d_printf("\"></td></tr>\n");
+	printf("\"></td></tr>\n");
 	if (winstype == 3) {
-		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Error: WINS Server Mode and WINS Support both set in smb.conf"));
-		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Please Select desired WINS mode above."));
+		printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Error: WINS Server Mode and WINS Support both set in smb.conf"));
+		printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Please Select desired WINS mode above."));
 	}
-	d_printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Expose Home Directories"));
-	d_printf("<td><input type=radio name=\"HomeExpo\" value=\"1\" %s> Yes</td>", (have_home == -1) ? "" : "checked ");
-	d_printf("<td><input type=radio name=\"HomeExpo\" value=\"0\" %s> No</td>", (have_home == -1 ) ? "checked" : "");
-	d_printf("<td></td></tr>\n");
+	printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Expose Home Directories"));
+	printf("<td><input type=radio name=\"HomeExpo\" value=\"1\" %s> Yes</td>", (have_home == -1) ? "" : "checked ");
+	printf("<td><input type=radio name=\"HomeExpo\" value=\"0\" %s> No</td>", (have_home == -1 ) ? "checked" : "");
+	printf("<td></td></tr>\n");
 	
 	/* Enable this when we are ready ....
-	 * d_printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Is Print Server"));
-	 * d_printf("<td><input type=radio name=\"PtrSvr\" value=\"1\" %s> Yes</td>");
-	 * d_printf("<td><input type=radio name=\"PtrSvr\" value=\"0\" %s> No</td>");
-	 * d_printf("<td></td></tr>\n");
+	 * printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Is Print Server"));
+	 * printf("<td><input type=radio name=\"PtrSvr\" value=\"1\" %s> Yes</td>");
+	 * printf("<td><input type=radio name=\"PtrSvr\" value=\"0\" %s> No</td>");
+	 * printf("<td></td></tr>\n");
 	 */
 	
-	d_printf("</table></center>");
-	d_printf("<hr>");
+	printf("</table></center>");
+	printf("<hr>");
 
-	d_printf("%s\n", _("The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."));
-	d_printf("</form>\n");
+	printf("%s\n", _("The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."));
+	printf("</form>\n");
 }
 
 
@@ -793,7 +793,7 @@ static void globals_page(void)
 	unsigned int parm_filter = FLAG_BASIC;
 	int mode = 0;
 
-	d_printf("<H2>%s</H2>\n", _("Global Parameters"));
+	printf("<H2>%s</H2>\n", _("Global Parameters"));
 
 	if (cgi_variable("Commit")) {
 		commit_parameters(GLOBAL_SECTION_SNUM);
@@ -807,7 +807,7 @@ static void globals_page(void)
 	if ( cgi_variable("AdvMode"))
 		mode = 1;
 
-	d_printf("<form name=\"swatform\" method=post action=globals>\n");
+	printf("<form name=\"swatform\" method=post action=globals>\n");
 
 	ViewModeBoxes( mode );
 	switch ( mode ) {
@@ -818,30 +818,30 @@ static void globals_page(void)
 			parm_filter = FLAG_ADVANCED;
 			break;
 	}
-	d_printf("<br>\n");
+	printf("<br>\n");
 	if (have_write_access) {
-		d_printf("<input type=submit name=\"Commit\" value=\"%s\">\n",
+		printf("<input type=submit name=\"Commit\" value=\"%s\">\n",
 			_("Commit Changes"));
 	}
 
-	d_printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", 
+	printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", 
 		 _("Reset Values"));
 
-	d_printf("<p>\n");
-	d_printf("<table>\n");
+	printf("<p>\n");
+	printf("<table>\n");
 	show_parameters(GLOBAL_SECTION_SNUM, 1, parm_filter, 0);
-	d_printf("</table>\n");
-	d_printf("</form>\n");
+	printf("</table>\n");
+	printf("</form>\n");
 }
 
 /****************************************************************************
-  display a shares editing page. share is in unix codepage, and must be in
-  dos codepage. FIXME !!! JRA.
+  display a shares editing page. share is in unix codepage, 
 ****************************************************************************/
 static void shares_page(void)
 {
 	const char *share = cgi_variable("share");
 	char *s;
+	char *utf8_s;
 	int snum = -1;
 	int i;
 	int mode = 0;
@@ -850,7 +850,7 @@ static void shares_page(void)
 	if (share)
 		snum = lp_servicenumber(share);
 
-	d_printf("<H2>%s</H2>\n", _("Share Parameters"));
+	printf("<H2>%s</H2>\n", _("Share Parameters"));
 
 	if (cgi_variable("Commit") && snum >= 0) {
 		commit_parameters(snum);
@@ -872,9 +872,9 @@ static void shares_page(void)
 		snum = lp_servicenumber(share);
 	}
 
-	d_printf("<FORM name=\"swatform\" method=post>\n");
+	printf("<FORM name=\"swatform\" method=post>\n");
 
-	d_printf("<table>\n");
+	printf("<table>\n");
 
 	if ( cgi_variable("ViewMode") )
 		mode = atoi(cgi_variable("ViewMode"));
@@ -892,50 +892,53 @@ static void shares_page(void)
 			parm_filter = FLAG_ADVANCED;
 			break;
 	}
-	d_printf("<br><tr>\n");
-	d_printf("<td><input type=submit name=selectshare value=\"%s\"></td>\n", _("Choose Share"));
-	d_printf("<td><select name=share>\n");
+	printf("<br><tr>\n");
+	printf("<td><input type=submit name=selectshare value=\"%s\"></td>\n", _("Choose Share"));
+	printf("<td><select name=share>\n");
 	if (snum < 0)
-		d_printf("<option value=\" \"> \n");
+		printf("<option value=\" \"> \n");
 	for (i=0;i<lp_numservices();i++) {
 		s = lp_servicename(i);
 		if (s && (*s) && strcmp(s,"IPC$") && !lp_print_ok(i)) {
-			d_printf("<option %s value=\"%s\">%s\n", 
+			push_utf8_allocate(&utf8_s, s);
+			printf("<option %s value=\"%s\">%s\n", 
 			       (share && strcmp(share,s)==0)?"SELECTED":"",
-			       s, s);
+			       utf8_s, utf8_s);
+			SAFE_FREE(utf8_s);
+			
 		}
 	}
-	d_printf("</select></td>\n");
+	printf("</select></td>\n");
 	if (have_write_access) {
-		d_printf("<td><input type=submit name=\"Delete\" value=\"%s\"></td>\n", _("Delete Share"));
+		printf("<td><input type=submit name=\"Delete\" value=\"%s\"></td>\n", _("Delete Share"));
 	}
-	d_printf("</tr>\n");
-	d_printf("</table>");
-	d_printf("<table>");
+	printf("</tr>\n");
+	printf("</table>");
+	printf("<table>");
 	if (have_write_access) {
-		d_printf("<tr>\n");
-		d_printf("<td><input type=submit name=createshare value=\"%s\"></td>\n", _("Create Share"));
-		d_printf("<td><input type=text size=30 name=newshare></td></tr>\n");
+		printf("<tr>\n");
+		printf("<td><input type=submit name=createshare value=\"%s\"></td>\n", _("Create Share"));
+		printf("<td><input type=text size=30 name=newshare></td></tr>\n");
 	}
-	d_printf("</table>");
+	printf("</table>");
 
 
 	if (snum >= 0) {
 		if (have_write_access) {
-			d_printf("<input type=submit name=\"Commit\" value=\"%s\">\n", _("Commit Changes"));
+			printf("<input type=submit name=\"Commit\" value=\"%s\">\n", _("Commit Changes"));
 		}
 
-		d_printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", _("Reset Values"));
-		d_printf("<p>\n");
+		printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", _("Reset Values"));
+		printf("<p>\n");
 	}
 
 	if (snum >= 0) {
-		d_printf("<table>\n");
+		printf("<table>\n");
 		show_parameters(snum, 1, parm_filter, 0);
-		d_printf("</table>\n");
+		printf("</table>\n");
 	}
 
-	d_printf("</FORM>\n");
+	printf("</FORM>\n");
 }
 
 /*************************************************************
@@ -950,7 +953,7 @@ static BOOL change_password(const char *remote_machine, const char *user_name,
 	pstring msg_str;
 
 	if (demo_mode) {
-		d_printf("%s\n<p>", _("password change in demo mode rejected"));
+		printf("%s\n<p>", _("password change in demo mode rejected"));
 		return False;
 	}
 	
@@ -958,12 +961,12 @@ static BOOL change_password(const char *remote_machine, const char *user_name,
 		ret = remote_password_change(remote_machine, user_name, old_passwd, 
 									 new_passwd, err_str, sizeof(err_str));
 		if(*err_str)
-			d_printf("%s\n<p>", err_str);
+			printf("%s\n<p>", err_str);
 		return ret;
 	}
 
 	if(!initialize_password_db(True)) {
-		d_printf("%s\n<p>", _("Can't setup password database vectors."));
+		printf("%s\n<p>", _("Can't setup password database vectors."));
 		return False;
 	}
 	
@@ -971,9 +974,9 @@ static BOOL change_password(const char *remote_machine, const char *user_name,
 					 msg_str, sizeof(msg_str));
 
 	if(*msg_str)
-		d_printf("%s\n<p>", msg_str);
+		printf("%s\n<p>", msg_str);
 	if(*err_str)
-		d_printf("%s\n<p>", err_str);
+		printf("%s\n<p>", err_str);
 
 	return ret;
 }
@@ -989,7 +992,7 @@ static void chg_passwd(void)
 
 	/* Make sure users name has been specified */
 	if (strlen(cgi_variable(SWAT_USER)) == 0) {
-		d_printf("<p>%s\n", _(" Must specify \"User Name\" "));
+		printf("<p>%s\n", _(" Must specify \"User Name\" "));
 		return;
 	}
 
@@ -1005,26 +1008,26 @@ static void chg_passwd(void)
 		 */
 		if (((!am_root()) && (strlen( cgi_variable(OLD_PSWD)) <= 0)) ||
 		    ((cgi_variable(CHG_R_PASSWD_FLAG)) &&  (strlen( cgi_variable(OLD_PSWD)) <= 0))) {
-			d_printf("<p>%s\n", _(" Must specify \"Old Password\" "));
+			printf("<p>%s\n", _(" Must specify \"Old Password\" "));
 			return;
 		}
 
 		/* If changing a users password on a remote hosts we have to know what host */
 		if ((cgi_variable(CHG_R_PASSWD_FLAG)) && (strlen( cgi_variable(RHOST)) <= 0)) {
-			d_printf("<p>%s\n", _(" Must specify \"Remote Machine\" "));
+			printf("<p>%s\n", _(" Must specify \"Remote Machine\" "));
 			return;
 		}
 
 		/* Make sure new passwords have been specified */
 		if ((strlen( cgi_variable(NEW_PSWD)) <= 0) ||
 		    (strlen( cgi_variable(NEW2_PSWD)) <= 0)) {
-			d_printf("<p>%s\n", _(" Must specify \"New, and Re-typed Passwords\" "));
+			printf("<p>%s\n", _(" Must specify \"New, and Re-typed Passwords\" "));
 			return;
 		}
 
 		/* Make sure new passwords was typed correctly twice */
 		if (strcmp(cgi_variable(NEW_PSWD), cgi_variable(NEW2_PSWD)) != 0) {
-			d_printf("<p>%s\n", _(" Re-typed password didn't match new password "));
+			printf("<p>%s\n", _(" Re-typed password didn't match new password "));
 			return;
 		}
 	}
@@ -1055,13 +1058,13 @@ static void chg_passwd(void)
 				   local_flags);
 
 	if(cgi_variable(CHG_S_PASSWD_FLAG)) {
-		d_printf("<p>");
+		printf("<p>");
 		if (rslt == True) {
-			d_printf(_(" The passwd for '%s' has been changed."), cgi_variable(SWAT_USER));
-			d_printf("\n");
+			printf(_(" The passwd for '%s' has been changed."), cgi_variable(SWAT_USER));
+			printf("\n");
 		} else {
-			d_printf(_(" The passwd for '%s' has NOT been changed."), cgi_variable(SWAT_USER));
-			d_printf("\n");
+			printf(_(" The passwd for '%s' has NOT been changed."), cgi_variable(SWAT_USER));
+			printf("\n");
 		}
 	}
 	
@@ -1085,43 +1088,43 @@ static void passwd_page(void)
 
 	if (!new_name) new_name = "";
 
-	d_printf("<H2>%s</H2>\n", _("Server Password Management"));
+	printf("<H2>%s</H2>\n", _("Server Password Management"));
 
-	d_printf("<FORM name=\"swatform\" method=post>\n");
+	printf("<FORM name=\"swatform\" method=post>\n");
 
-	d_printf("<table>\n");
+	printf("<table>\n");
 
 	/* 
 	 * Create all the dialog boxes for data collection
 	 */
-	d_printf("<tr><td> %s : </td>\n", _("User Name"));
-	d_printf("<td><input type=text size=30 name=%s value=%s></td></tr> \n", SWAT_USER, new_name);
+	printf("<tr><td> %s : </td>\n", _("User Name"));
+	printf("<td><input type=text size=30 name=%s value=%s></td></tr> \n", SWAT_USER, new_name);
 	if (!am_root()) {
-		d_printf("<tr><td> %s : </td>\n", _("Old Password"));
-		d_printf("<td><input type=password size=30 name=%s></td></tr> \n",OLD_PSWD);
+		printf("<tr><td> %s : </td>\n", _("Old Password"));
+		printf("<td><input type=password size=30 name=%s></td></tr> \n",OLD_PSWD);
 	}
-	d_printf("<tr><td> %s : </td>\n", _("New Password"));
-	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
-	d_printf("<tr><td> %s : </td>\n", _("Re-type New Password"));
-	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
-	d_printf("</table>\n");
+	printf("<tr><td> %s : </td>\n", _("New Password"));
+	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
+	printf("<tr><td> %s : </td>\n", _("Re-type New Password"));
+	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
+	printf("</table>\n");
 
 	/*
 	 * Create all the control buttons for requesting action
 	 */
-	d_printf("<input type=submit name=%s value=\"%s\">\n", 
+	printf("<input type=submit name=%s value=\"%s\">\n", 
 	       CHG_S_PASSWD_FLAG, _("Change Password"));
 	if (demo_mode || am_root()) {
-		d_printf("<input type=submit name=%s value=\"%s\">\n",
+		printf("<input type=submit name=%s value=\"%s\">\n",
 		       ADD_USER_FLAG, _("Add New User"));
-		d_printf("<input type=submit name=%s value=\"%s\">\n",
+		printf("<input type=submit name=%s value=\"%s\">\n",
 		       DELETE_USER_FLAG, _("Delete User"));
-		d_printf("<input type=submit name=%s value=\"%s\">\n", 
+		printf("<input type=submit name=%s value=\"%s\">\n", 
 		       DISABLE_USER_FLAG, _("Disable User"));
-		d_printf("<input type=submit name=%s value=\"%s\">\n", 
+		printf("<input type=submit name=%s value=\"%s\">\n", 
 		       ENABLE_USER_FLAG, _("Enable User"));
 	}
-	d_printf("<p></FORM>\n");
+	printf("<p></FORM>\n");
 
 	/*
 	 * Do some work if change, add, disable or enable was
@@ -1132,35 +1135,35 @@ static void passwd_page(void)
 		chg_passwd();		
 	}
 
-	d_printf("<H2>%s</H2>\n", _("Client/Server Password Management"));
+	printf("<H2>%s</H2>\n", _("Client/Server Password Management"));
 
-	d_printf("<FORM name=\"swatform\" method=post>\n");
+	printf("<FORM name=\"swatform\" method=post>\n");
 
-	d_printf("<table>\n");
+	printf("<table>\n");
 
 	/* 
 	 * Create all the dialog boxes for data collection
 	 */
-	d_printf("<tr><td> %s : </td>\n", _("User Name"));
-	d_printf("<td><input type=text size=30 name=%s value=%s></td></tr>\n",SWAT_USER, new_name);
-	d_printf("<tr><td> %s : </td>\n", _("Old Password"));
-	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",OLD_PSWD);
-	d_printf("<tr><td> %s : </td>\n", _("New Password"));
-	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
-	d_printf("<tr><td> %s : </td>\n", _("Re-type New Password"));
-	d_printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
-	d_printf("<tr><td> %s : </td>\n", _("Remote Machine"));
-	d_printf("<td><input type=text size=30 name=%s></td></tr>\n",RHOST);
-
-	d_printf("</table>");
+	printf("<tr><td> %s : </td>\n", _("User Name"));
+	printf("<td><input type=text size=30 name=%s value=%s></td></tr>\n",SWAT_USER, new_name);
+	printf("<tr><td> %s : </td>\n", _("Old Password"));
+	printf("<td><input type=password size=30 name=%s></td></tr>\n",OLD_PSWD);
+	printf("<tr><td> %s : </td>\n", _("New Password"));
+	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW_PSWD);
+	printf("<tr><td> %s : </td>\n", _("Re-type New Password"));
+	printf("<td><input type=password size=30 name=%s></td></tr>\n",NEW2_PSWD);
+	printf("<tr><td> %s : </td>\n", _("Remote Machine"));
+	printf("<td><input type=text size=30 name=%s></td></tr>\n",RHOST);
+
+	printf("</table>");
 
 	/*
 	 * Create all the control buttons for requesting action
 	 */
-	d_printf("<input type=submit name=%s value=\"%s\">", 
+	printf("<input type=submit name=%s value=\"%s\">", 
 	       CHG_R_PASSWD_FLAG, _("Change Password"));
 
-	d_printf("<p></FORM>\n");
+	printf("<p></FORM>\n");
 
 	/*
 	 * Do some work if a request has been made to change the
@@ -1188,13 +1191,13 @@ static void printers_page(void)
 	if (share)
 		snum = lp_servicenumber(share);
 
-        d_printf("<H2>%s</H2>\n", _("Printer Parameters"));
+        printf("<H2>%s</H2>\n", _("Printer Parameters"));
  
-        d_printf("<H3>%s</H3>\n", _("Important Note:"));
-        d_printf(_("Printer names marked with [*] in the Choose Printer drop-down box "));
-        d_printf(_("are autoloaded printers from "));
-        d_printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
-        d_printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect."));
+        printf("<H3>%s</H3>\n", _("Important Note:"));
+        printf(_("Printer names marked with [*] in the Choose Printer drop-down box "));
+        printf(_("are autoloaded printers from "));
+        printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
+        printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect."));
 
 	if (cgi_variable("Commit") && snum >= 0) {
 		commit_parameters(snum);
@@ -1221,7 +1224,7 @@ static void printers_page(void)
 		snum = lp_servicenumber(share);
 	}
 
-	d_printf("<FORM name=\"swatform\" method=post>\n");
+	printf("<FORM name=\"swatform\" method=post>\n");
 
 	if ( cgi_variable("ViewMode") )
 		mode = atoi(cgi_variable("ViewMode"));
@@ -1239,53 +1242,53 @@ static void printers_page(void)
 			parm_filter = FLAG_ADVANCED;
 			break;
 	}
-	d_printf("<table>\n");
-	d_printf("<tr><td><input type=submit name=\"selectshare\" value=\"%s\"></td>\n", _("Choose Printer"));
-	d_printf("<td><select name=\"share\">\n");
+	printf("<table>\n");
+	printf("<tr><td><input type=submit name=\"selectshare\" value=\"%s\"></td>\n", _("Choose Printer"));
+	printf("<td><select name=\"share\">\n");
 	if (snum < 0 || !lp_print_ok(snum))
-		d_printf("<option value=\" \"> \n");
+		printf("<option value=\" \"> \n");
 	for (i=0;i<lp_numservices();i++) {
 		s = lp_servicename(i);
 		if (s && (*s) && strcmp(s,"IPC$") && lp_print_ok(i)) {
                     if (i >= iNumNonAutoPrintServices)
-                        d_printf("<option %s value=\"%s\">[*]%s\n",
+                        printf("<option %s value=\"%s\">[*]%s\n",
                                (share && strcmp(share,s)==0)?"SELECTED":"",
                                s, s);
                     else
-			d_printf("<option %s value=\"%s\">%s\n", 
+			printf("<option %s value=\"%s\">%s\n", 
 			       (share && strcmp(share,s)==0)?"SELECTED":"",
 			       s, s);
 		}
 	}
-	d_printf("</select></td>");
+	printf("</select></td>");
 	if (have_write_access) {
-		d_printf("<td><input type=submit name=\"Delete\" value=\"%s\"></td>\n", _("Delete Printer"));
+		printf("<td><input type=submit name=\"Delete\" value=\"%s\"></td>\n", _("Delete Printer"));
 	}
-	d_printf("</tr>");
-	d_printf("</table>\n");
+	printf("</tr>");
+	printf("</table>\n");
 
 	if (have_write_access) {
-		d_printf("<table>\n");
-		d_printf("<tr><td><input type=submit name=\"createshare\" value=\"%s\"></td>\n", _("Create Printer"));
-		d_printf("<td><input type=text size=30 name=\"newshare\"></td></tr>\n");
-		d_printf("</table>");
+		printf("<table>\n");
+		printf("<tr><td><input type=submit name=\"createshare\" value=\"%s\"></td>\n", _("Create Printer"));
+		printf("<td><input type=text size=30 name=\"newshare\"></td></tr>\n");
+		printf("</table>");
 	}
 
 
 	if (snum >= 0) {
 		if (have_write_access) {
-			d_printf("<input type=submit name=\"Commit\" value=\"%s\">\n", _("Commit Changes"));
+			printf("<input type=submit name=\"Commit\" value=\"%s\">\n", _("Commit Changes"));
 		}
-		d_printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", _("Reset Values"));
-		d_printf("<p>\n");
+		printf("<input type=reset name=\"Reset Values\" value=\"%s\">\n", _("Reset Values"));
+		printf("<p>\n");
 	}
 
 	if (snum >= 0) {
-		d_printf("<table>\n");
+		printf("<table>\n");
 		show_parameters(snum, 1, parm_filter, 1);
-		d_printf("</table>\n");
+		printf("</table>\n");
 	}
-	d_printf("</FORM>\n");
+	printf("</FORM>\n");
 }
 
 
-- 
cgit 


From b4cf9e95059071df49b34ff8574e48cb96f42da1 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 7 Oct 2004 04:01:18 +0000
Subject: r2835: Since we always have -I. and -I$(srcdir) in CFLAGS, we can get
 rid of '..' from all #include preprocessor commands.   This fixes bugzilla
 #1880 where OpenVMS gets confused about the '.' characters. (This used to be
 commit 7f161702fa4916979602cc0295919b541912acd6)

---
 source3/web/cgi.c        | 2 +-
 source3/web/diagnose.c   | 2 +-
 source3/web/neg_lang.c   | 2 +-
 source3/web/startstop.c  | 2 +-
 source3/web/statuspage.c | 2 +-
 source3/web/swat.c       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 93731d1d3f..cf309c364e 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -19,7 +19,7 @@
 
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 #define MAX_VARIABLES 10000
 
diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index 46432c41f8..a490786068 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 #ifdef WITH_WINBIND
 
diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index da974f78a4..aa285745d6 100644
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 /*
   during a file download we first check to see if there is a language
diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 93e8650c2b..9ffda5bb94 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 #include "dynconfig.h"
 
 
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 2c645de248..953222c2fc 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 #define PIDMAP		struct PidMap
 
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 40f9f05991..48537d1d04 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -29,7 +29,7 @@
  **/
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 static BOOL demo_mode = False;
 static BOOL have_write_access = False;
-- 
cgit 


From acf9d61421faa6c0055d57fdee7db300dc5431aa Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 7 Dec 2004 18:25:53 +0000
Subject: r4088: Get medieval on our ass about malloc.... :-). Take control of
 all our allocation functions so we can funnel through some well known
 functions. Should help greatly with malloc checking. HEAD patch to follow.
 Jeremy. (This used to be commit 620f2e608f70ba92f032720c031283d295c5c06a)

---
 source3/web/cgi.c        | 20 ++++++++++----------
 source3/web/neg_lang.c   |  4 ++--
 source3/web/statuspage.c |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index cf309c364e..937e603f8c 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -59,7 +59,7 @@ static char *grab_line(FILE *f, int *cl)
 			char *ret2;
 			if (len == 0) len = 1024;
 			else len *= 2;
-			ret2 = (char *)Realloc(ret, len);
+			ret2 = (char *)SMB_REALLOC(ret, len);
 			if (!ret2) return ret;
 			ret = ret2;
 		}
@@ -135,8 +135,8 @@ void cgi_load_variables(void)
 			
 			*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);
 			
@@ -170,8 +170,8 @@ void cgi_load_variables(void)
 			
 			*p = 0;
 			
-			variables[num_variables].name = strdup(tok);
-			variables[num_variables].value = strdup(p+1);
+			variables[num_variables].name = SMB_STRDUP(tok);
+			variables[num_variables].value = SMB_STRDUP(p+1);
 
 			if (!variables[num_variables].name || 
 			    !variables[num_variables].value)
@@ -205,13 +205,13 @@ void cgi_load_variables(void)
 			       variables[i].name, -1, 
 			       dest, sizeof(dest), True);
 		free(variables[i].name);
-		variables[i].name = strdup(dest);
+		variables[i].name = SMB_STRDUP(dest);
 
 		convert_string(CH_UTF8, CH_UNIX, 
 			       variables[i].value, -1,
 			       dest, sizeof(dest), True);
 		free(variables[i].value);
-		variables[i].value = strdup(dest);
+		variables[i].value = SMB_STRDUP(dest);
 	}
 }
 
@@ -366,7 +366,7 @@ static BOOL cgi_handle_authorization(char *line)
 			become_user_permanently(pass->pw_uid, pass->pw_gid);
 			
 			/* Save the users name */
-			C_user = strdup(user);
+			C_user = SMB_STRDUP(user);
 			passwd_free(&pass);
 			return True;
 		}
@@ -530,11 +530,11 @@ void cgi_setup(const char *rootdir, int auth_required)
 		if (line[0] == '\r' || line[0] == '\n') break;
 		if (strnequal(line,"GET ", 4)) {
 			got_request = True;
-			url = strdup(&line[4]);
+			url = SMB_STRDUP(&line[4]);
 		} else if (strnequal(line,"POST ", 5)) {
 			got_request = True;
 			request_post = 1;
-			url = strdup(&line[5]);
+			url = SMB_STRDUP(&line[5]);
 		} else if (strnequal(line,"PUT ", 4)) {
 			got_request = True;
 			cgi_setup_error("400 Bad Request", "",
diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index aa285745d6..ca671822d8 100644
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -85,7 +85,7 @@ void web_set_lang(const char *lang_string)
 		count++;
 		lang_num++;
 	}
-	pl = (struct pri_list *)malloc(sizeof(struct pri_list) * lang_num);
+	pl = SMB_MALLOC_ARRAY(struct pri_list, lang_num);
 	for (i = 0; i < lang_num; i++) {
 		char *pri_code;
 		if ((pri_code=strstr(lang_list[i], ";q="))) {
@@ -95,7 +95,7 @@ void web_set_lang(const char *lang_string)
 		} else {
 			pl[i].pri = 1;
 		}
-		pl[i].string = strdup(lang_list[i]);
+		pl[i].string = SMB_STRDUP(lang_list[i]);
 	}
 	str_list_free(&lang_list);
 
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 953222c2fc..57b5d0f7b7 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -61,14 +61,14 @@ static void addPid2Machine (pid_t pid, char *machine)
 	if (PID_or_Machine) {
 		PIDMAP *newmap;
 
-		if ((newmap = (PIDMAP *) malloc (sizeof (PIDMAP))) == NULL) {
+		if ((newmap = SMB_MALLOC_P(PIDMAP)) == NULL) {
 			/* XXX need error message for this?
 			   if malloc fails, PID is always shown */
 			return;
 		}
 
 		newmap->pid = pid;
-		newmap->machine = strdup (machine);
+		newmap->machine = SMB_STRDUP(machine);
 
 		DLIST_ADD(pidmap, newmap);
 	}
-- 
cgit 


From 7f98253a67d9f417f98376f0608b7dd61e0b7150 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sun, 26 Dec 2004 18:51:49 +0000
Subject: r4369: Patch for bug #2190 (SWAT displaying parameters in UNIX
 charset) not utf8. Fixed by Shiro Yamada <shiro@miraclelinux.com>. Jeremy.
 (This used to be commit 8de04888097b3e125845340ba1a9a1bb79892e22)

---
 source3/web/swat.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 48537d1d04..7bd9837c37 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -193,6 +193,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 {
 	int i;
 	void *ptr = parm->ptr;
+	char *utf8_s1, *utf8_s2;
 
 	if (parm->class == P_LOCAL && snum >= 0) {
 		ptr = lp_local_ptr(snum, ptr);
@@ -214,10 +215,17 @@ static void show_parameter(int snum, struct parm_struct *parm)
 			char **list = *(char ***)ptr;
 			for (;*list;list++) {
 				/* enclose in quotes if the string contains a space */
-				if ( strchr_m(*list, ' ') ) 
-					printf("\'%s\'%s", *list, ((*(list+1))?", ":""));
-				else
-					printf("%s%s", *list, ((*(list+1))?", ":""));
+				if ( strchr_m(*list, ' ') ) {
+					push_utf8_allocate(&utf8_s1, *list);
+					push_utf8_allocate(&utf8_s2, ((*(list+1))?", ":""));
+					printf("\'%s\'%s", utf8_s1, utf8_s2);
+				} else {
+					push_utf8_allocate(&utf8_s1, *list);
+					push_utf8_allocate(&utf8_s2, ((*(list+1))?", ":""));
+					printf("%s%s", utf8_s1, utf8_s2);
+				}
+				SAFE_FREE(utf8_s1);
+				SAFE_FREE(utf8_s2);
 			}
 		}
 		printf("\">");
@@ -238,16 +246,20 @@ static void show_parameter(int snum, struct parm_struct *parm)
 
 	case P_STRING:
 	case P_USTRING:
+		push_utf8_allocate(&utf8_s1, *(char **)ptr);
 		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
-		       make_parm_name(parm->label), *(char **)ptr);
+		       make_parm_name(parm->label), utf8_s1);
+		SAFE_FREE(utf8_s1);
 		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
 			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
 		break;
 
 	case P_GSTRING:
 	case P_UGSTRING:
+		push_utf8_allocate(&utf8_s1, (char *)ptr);
 		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
-		       make_parm_name(parm->label), (char *)ptr);
+		       make_parm_name(parm->label), utf8_s1);
+		SAFE_FREE(utf8_s1);
 		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
 			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
 		break;
-- 
cgit 


From 23c143dc4190ea2e15d340cebd1a5ecc12ebeedd Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 6 Jan 2005 19:32:39 +0000
Subject: r4577: Fix from William Jojo <jojowil@hvcc.edu> for AIX 5.3 compile.
 Jeremy. (This used to be commit 80e7c6c312eb0bdb93fe381e7ce3a24a21dd9cf0)

---
 source3/web/cgi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 937e603f8c..5d52ad6279 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -30,12 +30,12 @@
 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;
-- 
cgit 


From 4beae9996a136127350d1d7539e314f085d1a00c Mon Sep 17 00:00:00 2001
From: Deryck Hodge <deryck@samba.org>
Date: Wed, 2 Feb 2005 18:01:11 +0000
Subject: r5179: Add -P (password-menu-only) option to swat.  Admins can allow
 users to use swat to change their password without allowing them to see the
 "View" and "Status" buttons.

deryck
(This used to be commit c9cacd553f8e7aa2db011cb7b22dd791b7460ea0)
---
 source3/web/swat.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 7bd9837c37..e7402e0a0f 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -32,6 +32,7 @@
 #include "web/swat_proto.h"
 
 static BOOL demo_mode = False;
+static BOOL passwd_only = False;
 static BOOL have_write_access = False;
 static BOOL have_read_access = False;
 static int iNumNonAutoPrintServices = 0;
@@ -530,7 +531,8 @@ static void show_main_buttons(void)
 		image_link(_("Printers"), "printers", "images/printers.gif");
 		image_link(_("Wizard"), "wizard", "images/wizard.gif");
 	}
-	if (have_read_access) {
+   /* root always gets all buttons, otherwise look for -P */
+	if ( have_write_access || (!passwd_only && have_read_access) ) {
 		image_link(_("Status"), "status", "images/status.gif");
 		image_link(_("View Config"), "viewconfig", "images/viewconfig.gif");
 	}
@@ -1315,6 +1317,7 @@ static void printers_page(void)
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
 		{ "disable-authentication", 'a', POPT_ARG_VAL, &demo_mode, True, "Disable authentication (demo mode)" },
+        { "password-menu-only", 'P', POPT_ARG_VAL, &passwd_only, True, "Show only change password menu" }, 
 		POPT_COMMON_SAMBA
 		POPT_TABLEEND
 	};
-- 
cgit 


From 9840db418bad5a39edc4a32a1786f5e2d2c9dff8 Mon Sep 17 00:00:00 2001
From: Derrell Lipman <derrell@samba.org>
Date: Thu, 31 Mar 2005 05:06:04 +0000
Subject: r6149: Fixes bugs #2498 and 2484.

1. using smbc_getxattr() et al, one may now request all access control
   entities in the ACL without getting all other NT attributes.
2. added the ability to exclude specified attributes from the result set
   provided by smbc_getxattr() et al, when requesting all attributes,
   all NT attributes, or all DOS attributes.
3. eliminated all compiler warnings, including when --enable-developer
   compiler flags are in use.  removed -Wcast-qual flag from list, as that
   is specifically to force warnings in the case of casting away qualifiers.

Note: In the process of eliminating compiler warnings, a few nasties were
      discovered.  In the file libads/sasl.c, PRIVATE kerberos interfaces
      are being used; and in libsmb/clikrb5.c, both PRIAVE and DEPRECATED
      kerberos interfaces are being used.  Someone who knows kerberos
      should look at these and determine if there is an alternate method
      of accomplishing the task.
(This used to be commit 994694f7f26da5099f071e1381271a70407f33bb)
---
 source3/web/neg_lang.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index ca671822d8..cc2924afde 100644
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -54,8 +54,8 @@ struct pri_list {
 };
 
 static int qsort_cmp_list(const void *x, const void *y) {
-	struct pri_list *a = (struct pri_list *)x;
-	struct pri_list *b = (struct pri_list *)y;
+        struct pri_list *a = CONST_DISCARD(struct pri_list *, x);
+	struct pri_list *b = CONST_DISCARD(struct pri_list *, y);
 	if (a->pri > b->pri) return -1;
 	if (a->pri == b->pri) return 0;
 	return 1;
-- 
cgit 


From 978ca8486031e43754a3c23757f361bf3a85f335 Mon Sep 17 00:00:00 2001
From: Herb Lewis <herb@samba.org>
Date: Wed, 6 Apr 2005 16:28:04 +0000
Subject: r6225: get rid of warnings from my compiler about nested externs
 (This used to be commit efea76ac71412f8622cd233912309e91b9ea52da)

---
 source3/web/diagnose.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index a490786068..0c9c854df7 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -23,6 +23,8 @@
 
 #ifdef WITH_WINBIND
 
+extern struct in_addr loopback_ip;
+
 NSS_STATUS winbindd_request(int req_type,
 			struct winbindd_request *request,
 			struct winbindd_response *response);
@@ -39,7 +41,6 @@ BOOL winbindd_running(void)
    response */
 BOOL nmbd_running(void)
 {
-	extern struct in_addr loopback_ip;
 	int fd, count, flags;
 	struct in_addr *ip_list;
 
@@ -64,7 +65,6 @@ BOOL nmbd_running(void)
 BOOL smbd_running(void)
 {
 	static struct cli_state cli;
-	extern struct in_addr loopback_ip;
 
 	if (!cli_initialise(&cli))
 		return False;
-- 
cgit 


From dded66808dab60c4e64e5401a5cb8b1605e29f0e Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 10 Apr 2005 15:54:18 +0000
Subject: r6281: Fix the build for FreeBSD 4 -- no winbind (This used to be
 commit 1ce9a0159d36c2e4f154fb60c86cebcfbc2038dc)

---
 source3/web/diagnose.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index 0c9c854df7..f4b022cf58 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -21,10 +21,10 @@
 #include "includes.h"
 #include "web/swat_proto.h"
 
-#ifdef WITH_WINBIND
-
 extern struct in_addr loopback_ip;
 
+#ifdef WITH_WINBIND
+
 NSS_STATUS winbindd_request(int req_type,
 			struct winbindd_request *request,
 			struct winbindd_response *response);
-- 
cgit 


From dd995fcc534a6501e5cda1d8d214727b5c3599f5 Mon Sep 17 00:00:00 2001
From: Deryck Hodge <deryck@samba.org>
Date: Tue, 19 Apr 2005 21:35:42 +0000
Subject: r6395: Fix for Bug 2137, from Jay Fenlason <fenlason@redhat.com>
 Encode quotes for display in HTML.

deryck
(This used to be commit b9b18a09ea3bf3edba15dc073dd20b195bc6082b)
---
 source3/web/swat.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index e7402e0a0f..1d6241fdd6 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -215,11 +215,11 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		if ((char ***)ptr && *(char ***)ptr && **(char ***)ptr) {
 			char **list = *(char ***)ptr;
 			for (;*list;list++) {
-				/* enclose in quotes if the string contains a space */
+				/* enclose in HTML encoded quotes if the string contains a space */
 				if ( strchr_m(*list, ' ') ) {
 					push_utf8_allocate(&utf8_s1, *list);
 					push_utf8_allocate(&utf8_s2, ((*(list+1))?", ":""));
-					printf("\'%s\'%s", utf8_s1, utf8_s2);
+					printf("&quot;%s&quot;%s", utf8_s1, utf8_s2);
 				} else {
 					push_utf8_allocate(&utf8_s1, *list);
 					push_utf8_allocate(&utf8_s2, ((*(list+1))?", ":""));
@@ -235,9 +235,9 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		if (parm->def.lvalue) {
 			char **list = (char **)(parm->def.lvalue);
 			for (; *list; list++) {
-				/* enclose in quotes if the string contains a space */
+				/* enclose in HTML encoded quotes if the string contains a space */
 				if ( strchr_m(*list, ' ') ) 
-					printf("\'%s\'%s", *list, ((*(list+1))?", ":""));
+					printf("&quot;%s&quot;%s", *list, ((*(list+1))?", ":""));
 				else
 					printf("%s%s", *list, ((*(list+1))?", ":""));
 			}
-- 
cgit 


From 572659f22154ef68b687b8c7f399021b5a99ad4c Mon Sep 17 00:00:00 2001
From: Deryck Hodge <deryck@samba.org>
Date: Tue, 24 May 2005 17:33:47 +0000
Subject: r6958: Properly display quotes in SWAT. Thanks to Jay Fenlason
 <fenlason@redhat.com> for spotting this issue.

deryck
(This used to be commit cd12641383c50020104142cad0e705e2b58c50f4)
---
 source3/web/swat.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 1d6241fdd6..d7e4e72241 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -77,6 +77,26 @@ static char *fix_backslash(const char *str)
 	return newstring;
 }
 
+static char *fix_quotes(const char *str)
+{
+	static pstring newstring;
+	char *p = newstring;
+	size_t newstring_len = sizeof(newstring);
+	int quote_len = strlen("&quot;");
+
+	while (*str) {
+		if ( *str == '\"' && (newstring_len - PTR_DIFF(p, newstring) - 1) > quote_len ) {
+			strncpy( p, "&quot;", quote_len); 
+			p += 6;
+		} else {
+			*p++ = *str;
+		}
+		++str;
+	}
+	*p = '\0';
+	return newstring;
+}
+
 static char *stripspaceupper(const char *str)
 {
 	static char newstring[1024];
@@ -249,7 +269,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 	case P_USTRING:
 		push_utf8_allocate(&utf8_s1, *(char **)ptr);
 		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
-		       make_parm_name(parm->label), utf8_s1);
+		       make_parm_name(parm->label), fix_quotes(utf8_s1));
 		SAFE_FREE(utf8_s1);
 		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
 			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
@@ -259,7 +279,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 	case P_UGSTRING:
 		push_utf8_allocate(&utf8_s1, (char *)ptr);
 		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
-		       make_parm_name(parm->label), utf8_s1);
+		       make_parm_name(parm->label), fix_quotes(utf8_s1));
 		SAFE_FREE(utf8_s1);
 		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
 			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
-- 
cgit 


From efaafdd27b931696afb3f9f53eefe7d559f2c05a Mon Sep 17 00:00:00 2001
From: Deryck Hodge <deryck@samba.org>
Date: Tue, 24 May 2005 17:37:04 +0000
Subject: r6959: Meant to fix this before commiting, just to be consistent.

deryck
(This used to be commit 3732705605c757d8647efa2731070025f79ab302)
---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index d7e4e72241..8505f1a685 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -87,7 +87,7 @@ static char *fix_quotes(const char *str)
 	while (*str) {
 		if ( *str == '\"' && (newstring_len - PTR_DIFF(p, newstring) - 1) > quote_len ) {
 			strncpy( p, "&quot;", quote_len); 
-			p += 6;
+			p += quote_len;
 		} else {
 			*p++ = *str;
 		}
-- 
cgit 


From 19ca97a70f6b7b41d251eaa76e4d3c980c6eedff Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 24 Jun 2005 20:25:18 +0000
Subject: r7882: Looks like a large patch - but what it actually does is make
 Samba safe for using our headers and linking with C++ modules. Stops us from
 using C++ reserved keywords in our code. Jeremy (This used to be commit
 9506b8e145982b1160a2f0aee5c9b7a54980940a)

---
 source3/web/diagnose.c |  4 ----
 source3/web/swat.c     | 10 +++++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index f4b022cf58..d259717da0 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -25,10 +25,6 @@ extern struct in_addr loopback_ip;
 
 #ifdef WITH_WINBIND
 
-NSS_STATUS winbindd_request(int req_type,
-			struct winbindd_request *request,
-			struct winbindd_response *response);
-
 /* check to see if winbind is running by pinging it */
 
 BOOL winbindd_running(void)
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 8505f1a685..14889e35aa 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -216,7 +216,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 	void *ptr = parm->ptr;
 	char *utf8_s1, *utf8_s2;
 
-	if (parm->class == P_LOCAL && snum >= 0) {
+	if (parm->p_class == P_LOCAL && snum >= 0) {
 		ptr = lp_local_ptr(snum, ptr);
 	}
 
@@ -344,9 +344,9 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
 	const char *last_heading = NULL;
 
 	while ((parm = lp_next_parameter(snum, &i, allparameters))) {
-		if (snum < 0 && parm->class == P_LOCAL && !(parm->flags & FLAG_GLOBAL))
+		if (snum < 0 && parm->p_class == P_LOCAL && !(parm->flags & FLAG_GLOBAL))
 			continue;
-		if (parm->class == P_SEPARATOR) {
+		if (parm->p_class == P_SEPARATOR) {
 			heading = parm->label;
 			continue;
 		}
@@ -360,7 +360,7 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
 			if (!(parm->flags & FLAG_BASIC)) {
 					void *ptr = parm->ptr;
 
-				if (parm->class == P_LOCAL && snum >= 0) {
+				if (parm->p_class == P_LOCAL && snum >= 0) {
 					ptr = lp_local_ptr(snum, ptr);
 				}
 
@@ -488,7 +488,7 @@ static void commit_parameter(int snum, struct parm_struct *parm, const char *v)
 	int i;
 	char *s;
 
-	if (snum < 0 && parm->class == P_LOCAL) {
+	if (snum < 0 && parm->p_class == P_LOCAL) {
 		/* this handles the case where we are changing a local
 		   variable globally. We need to change the parameter in 
 		   all shares where it is currently set to the default */
-- 
cgit 


From af8a691db11a5072865f8b03fd1cbd3aab5cb6d7 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 8 Jul 2005 04:51:27 +0000
Subject: r8219: Merge the new open code from HEAD to 3.0. Haven't yet run the
 torture tests on this as it's very late NY time (just wanted to get this work
 into the tree). I'll test this over the weekend.... Jerry - in looking at the
 difference between the two trees there seem to be some printing/ntprinting.c
 and registry changes we might want to examine to try keep in sync. Jeremy.
 (This used to be commit c7fe18761e2c753afbffd3a78abff46472a9b8eb)

---
 source3/web/cgi.c        |  4 ++++
 source3/web/statuspage.c | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 5d52ad6279..6c9cfce13c 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -457,6 +457,10 @@ static void cgi_download(char *file)
 			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 {
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 57b5d0f7b7..871e07b5d0 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -108,23 +108,28 @@ static char *tstring(time_t t)
 static void print_share_mode(share_mode_entry *e, char *fname)
 {
 	char           *utf8_fname;
+	int deny_mode = map_share_mode_to_deny_mode(e->share_access,
+						    e->private_options);
 
 	printf("<tr><td>%s</td>",_(mapPid2Machine(e->pid)));
 	printf("<td>");
-	switch ((e->share_mode>>4)&0xF) {
+	switch ((deny_mode>>4)&0xF) {
 	case DENY_NONE: printf("DENY_NONE"); break;
 	case DENY_ALL:  printf("DENY_ALL   "); break;
 	case DENY_DOS:  printf("DENY_DOS   "); break;
+	case DENY_FCB:  printf("DENY_FCB   "); break;
 	case DENY_READ: printf("DENY_READ  "); break;
 	case DENY_WRITE:printf("DENY_WRITE "); break;
 	}
 	printf("</td>");
 
 	printf("<td>");
-	switch (e->share_mode&0xF) {
-	case 0: printf("%s", _("RDONLY     ")); break;
-	case 1: printf("%s", _("WRONLY     ")); break;
-	case 2: printf("%s", _("RDWR       ")); break;
+	if (e->access_mask & (FILE_READ_DATA|FILE_WRITE_DATA)) {
+		printf("%s", _("RDWR       "));
+	} else if (e->access_mask & FILE_WRITE_DATA) {
+		printf("%s", _("WRONLY     "));
+	} else {
+		printf("%s", _("RDONLY     "));
 	}
 	printf("</td>");
 
-- 
cgit 


From 3bda33caf0ef6ced2a7a87b9082f14dc76631027 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 12 Aug 2005 16:03:21 +0000
Subject: r9266: fix help links in swat editor after doc layout changes (This
 used to be commit 4d50671602def039034fa03615cc9a205eba89c5)

---
 source3/web/swat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 14889e35aa..43dacb2945 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -188,12 +188,12 @@ static const char* get_parm_translated(
 	if(strcmp(pLabel, pTranslated) != 0)
 	{
 		pstr_sprintf(output,
-		  "<A HREF=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
+		  "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
 		   pAnchor, pHelp, pLabel, pTranslated);
 		return output;
 	}
 	pstr_sprintf(output, 
-	  "<A HREF=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s",
+	  "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s",
 	  pAnchor, pHelp, pLabel);
 	return output;
 }
-- 
cgit 


From 2f626e7b5ad2d921490723e32863bd423e8272cd Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 30 Aug 2005 11:41:45 +0000
Subject: r9790: remove 'set but not used' variables (reported by Jason Mader)
 (This used to be commit 9c78f3b0d6c36854e082a89cb1ee5b80fcc9fe35)

---
 source3/web/swat.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 43dacb2945..15612484a3 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1331,13 +1331,12 @@ static void printers_page(void)
  **/
  int main(int argc, char *argv[])
 {
-	int opt;
 	const char *page;
 	poptContext pc;
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
 		{ "disable-authentication", 'a', POPT_ARG_VAL, &demo_mode, True, "Disable authentication (demo mode)" },
-        { "password-menu-only", 'P', POPT_ARG_VAL, &passwd_only, True, "Show only change password menu" }, 
+        	{ "password-menu-only", 'P', POPT_ARG_VAL, &passwd_only, True, "Show only change password menu" }, 
 		POPT_COMMON_SAMBA
 		POPT_TABLEEND
 	};
@@ -1368,7 +1367,7 @@ static void printers_page(void)
 
 	/* Parse command line options */
 
-	while((opt = poptGetNextOpt(pc)) != -1) { }
+	while(poptGetNextOpt(pc) != -1) { }
 
 	poptFreeContext(pc);
 
-- 
cgit 


From 54abd2aa66069e6baf7769c496f46d9dba18db39 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 30 Sep 2005 17:13:37 +0000
Subject: r10656: BIG merge from trunk.  Features not copied over

* \PIPE\unixinfo
* winbindd's {group,alias}membership new functions
* winbindd's lookupsids() functionality
* swat (trunk changes to be reverted as per discussion with Deryck)
(This used to be commit 939c3cb5d78e3a2236209b296aa8aba8bdce32d3)
---
 source3/web/diagnose.c   |   4 +-
 source3/web/neg_lang.c   |   4 +-
 source3/web/startstop.c  |   6 +-
 source3/web/statuspage.c |  34 ++++++------
 source3/web/swat.c       | 142 +++++++++++++++++++++++++++++++++--------------
 5 files changed, 125 insertions(+), 65 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index d259717da0..c7a7a3598e 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -21,8 +21,6 @@
 #include "includes.h"
 #include "web/swat_proto.h"
 
-extern struct in_addr loopback_ip;
-
 #ifdef WITH_WINBIND
 
 /* check to see if winbind is running by pinging it */
@@ -37,6 +35,7 @@ BOOL winbindd_running(void)
    response */
 BOOL nmbd_running(void)
 {
+	extern struct in_addr loopback_ip;
 	int fd, count, flags;
 	struct in_addr *ip_list;
 
@@ -61,6 +60,7 @@ BOOL nmbd_running(void)
 BOOL smbd_running(void)
 {
 	static struct cli_state cli;
+	extern struct in_addr loopback_ip;
 
 	if (!cli_initialise(&cli))
 		return False;
diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index cc2924afde..ca671822d8 100644
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -54,8 +54,8 @@ struct pri_list {
 };
 
 static int qsort_cmp_list(const void *x, const void *y) {
-        struct pri_list *a = CONST_DISCARD(struct pri_list *, x);
-	struct pri_list *b = CONST_DISCARD(struct pri_list *, y);
+	struct pri_list *a = (struct pri_list *)x;
+	struct pri_list *b = (struct pri_list *)y;
 	if (a->pri > b->pri) return -1;
 	if (a->pri == b->pri) return 0;
 	return 1;
diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 9ffda5bb94..8f28748918 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -121,11 +121,11 @@ void stop_winbindd(void)
 }
 #endif
 /* kill a specified process */
-void kill_pid(pid_t pid)
+void kill_pid(struct process_id pid)
 {
 	if (geteuid() != 0) return;
 
-	if (pid <= 0) return;
+	if (procid_to_pid(&pid) <= 0) return;
 
-	kill(pid, SIGTERM);
+	kill(procid_to_pid(&pid), SIGTERM);
 }
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 871e07b5d0..edc0318373 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -28,14 +28,14 @@
 
 PIDMAP {
 	PIDMAP	*next, *prev;
-	pid_t	pid;
+	struct process_id pid;
 	char	*machine;
 };
 
 static PIDMAP	*pidmap;
 static int	PID_or_Machine;		/* 0 = show PID, else show Machine name */
 
-static pid_t smbd_pid;
+static struct process_id smbd_pid;
 
 /* from 2nd call on, remove old list */
 static void initPid2Machine (void)
@@ -55,7 +55,7 @@ static void initPid2Machine (void)
 }
 
 /* add new PID <-> Machine name mapping */
-static void addPid2Machine (pid_t pid, char *machine)
+static void addPid2Machine (struct process_id pid, char *machine)
 {
 	/* show machine name rather PID on table "Open Files"? */
 	if (PID_or_Machine) {
@@ -75,7 +75,7 @@ static void addPid2Machine (pid_t pid, char *machine)
 }
 
 /* lookup PID <-> Machine name mapping */
-static char *mapPid2Machine (pid_t pid)
+static char *mapPid2Machine (struct process_id pid)
 {
 	static char pidbuf [64];
 	PIDMAP *map;
@@ -83,7 +83,7 @@ static char *mapPid2Machine (pid_t pid)
 	/* show machine name rather PID on table "Open Files"? */
 	if (PID_or_Machine) {
 		for (map = pidmap; map != NULL; map = map->next) {
-			if (pid == map->pid) {
+			if (procid_equal(&pid, &map->pid)) {
 				if (map->machine == NULL)	/* no machine name */
 					break;			/* show PID */
 
@@ -93,7 +93,8 @@ static char *mapPid2Machine (pid_t pid)
 	}
 
 	/* PID not in list or machine name NULL? return pid as string */
-	snprintf (pidbuf, sizeof (pidbuf) - 1, "%lu", (unsigned long)pid);
+	snprintf (pidbuf, sizeof (pidbuf) - 1, "%s",
+		  procid_str_static(&pid));
 	return pidbuf;
 }
 
@@ -105,7 +106,7 @@ static char *tstring(time_t t)
 	return buf;
 }
 
-static void print_share_mode(share_mode_entry *e, char *fname)
+static void print_share_mode(const struct share_mode_entry *e, char *fname)
 {
 	char           *utf8_fname;
 	int deny_mode = map_share_mode_to_deny_mode(e->share_access,
@@ -167,7 +168,7 @@ static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 
 	if (crec.cnum == -1 && process_exists(crec.pid)) {
 		char buf[30];
-		slprintf(buf,sizeof(buf)-1,"kill_%d", (int)crec.pid);
+		slprintf(buf,sizeof(buf)-1,"kill_%s", procid_str_static(&crec.pid));
 		if (cgi_variable(buf)) {
 			kill_pid(crec.pid);
 			sleep(SLEEP_TIME);
@@ -186,18 +187,19 @@ static int traverse_fn2(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 
 	memcpy(&crec, dbuf.dptr, sizeof(crec));
 	
-	if (crec.cnum == -1 || !process_exists(crec.pid) || (crec.pid == smbd_pid))
+	if (crec.cnum == -1 || !process_exists(crec.pid) ||
+	    procid_equal(&crec.pid, &smbd_pid))
 		return 0;
 
 	addPid2Machine (crec.pid, crec.machine);
 
-	printf("<tr><td>%d</td><td>%s</td><td>%s</td><td>%s</td>\n",
-	       (int)crec.pid,
+	printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td>\n",
+	       procid_str_static(&crec.pid),
 	       crec.machine,crec.addr,
 	       tstring(crec.start));
 	if (geteuid() == 0) {
-		printf("<td><input type=submit value=\"X\" name=\"kill_%d\"></td>\n",
-		       (int)crec.pid);
+		printf("<td><input type=submit value=\"X\" name=\"kill_%s\"></td>\n",
+		       procid_str_static(&crec.pid));
 	}
 	printf("</tr>\n");
 
@@ -217,9 +219,9 @@ static int traverse_fn3(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 	if (crec.cnum == -1 || !process_exists(crec.pid))
 		return 0;
 
-	printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td></tr>\n",
+	printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n",
 	       crec.name,uidtoname(crec.uid),
-	       gidtoname(crec.gid),(int)crec.pid,
+	       gidtoname(crec.gid),procid_str_static(&crec.pid),
 	       crec.machine,
 	       tstring(crec.start));
 	return 0;
@@ -236,7 +238,7 @@ void status_page(void)
 	int nr_running=0;
 	BOOL waitup = False;
 
-	smbd_pid = pidfile_pid("smbd");
+	smbd_pid = pid_to_procid(pidfile_pid("smbd"));
 
 	if (cgi_variable("smbd_restart") || cgi_variable("all_restart")) {
 		stop_smbd();
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 15612484a3..4082574e44 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -188,12 +188,12 @@ static const char* get_parm_translated(
 	if(strcmp(pLabel, pTranslated) != 0)
 	{
 		pstr_sprintf(output,
-		  "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
+		  "<A HREF=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
 		   pAnchor, pHelp, pLabel, pTranslated);
 		return output;
 	}
 	pstr_sprintf(output, 
-	  "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s",
+	  "<a href=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\" class=\"help_link\"> %s</a> %s",
 	  pAnchor, pHelp, pLabel);
 	return output;
 }
@@ -220,7 +220,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		ptr = lp_local_ptr(snum, ptr);
 	}
 
-	printf("<tr><td>%s</td><td>", get_parm_translated(stripspaceupper(parm->label), _("Help"), parm->label));
+	printf("<tr><td width=\"230\">%s</td><td>", get_parm_translated(stripspaceupper(parm->label), _("Help"), parm->label));
 	switch (parm->type) {
 	case P_CHAR:
 		printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",
@@ -230,7 +230,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		break;
 
 	case P_LIST:
-		printf("<input type=text size=40 name=\"parm_%s\" value=\"",
+		printf("<input type=text size=30 name=\"parm_%s\" value=\"",
 			make_parm_name(parm->label));
 		if ((char ***)ptr && *(char ***)ptr && **(char ***)ptr) {
 			char **list = *(char ***)ptr;
@@ -268,7 +268,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 	case P_STRING:
 	case P_USTRING:
 		push_utf8_allocate(&utf8_s1, *(char **)ptr);
-		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
+		printf("<input type=text size=30 name=\"parm_%s\" value=\"%s\">",
 		       make_parm_name(parm->label), fix_quotes(utf8_s1));
 		SAFE_FREE(utf8_s1);
 		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
@@ -278,7 +278,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 	case P_GSTRING:
 	case P_UGSTRING:
 		push_utf8_allocate(&utf8_s1, (char *)ptr);
-		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
+		printf("<input type=text size=30 name=\"parm_%s\" value=\"%s\">",
 		       make_parm_name(parm->label), fix_quotes(utf8_s1));
 		SAFE_FREE(utf8_s1);
 		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
@@ -523,42 +523,50 @@ static void commit_parameters(int snum)
 }
 
 /****************************************************************************
-  spit out the html for a link with an image 
+  generate html for rollovers
 ****************************************************************************/
-static void image_link(const char *name, const char *hlink, const char *src)
+static void rollover_link(const char *name, const char *id, const char *page)
 {
-	printf("<A HREF=\"%s/%s\"><img border=\"0\" src=\"/swat/%s\" alt=\"%s\"></A>\n", 
-	       cgi_baseurl(), hlink, src, name);
+	if ( strcmp(page, id)==0 ) {
+		printf("    <img src=\"/swat/images/%s_flat.png\" alt=\"%s\" />\n", 
+	       	   id, name);
+	} else {
+		printf("    <a href=\"%s/%s\" onmouseover=\"swapImg('%s','%sOver')\" onmouseout=\"swapImg('%s','%sLink')\"><img src=\"/swat/images/%s_link.png\" name=\"%s\" alt=\"%s\" /></a>\n",
+	       cgi_baseurl(), id, id, id, id, id, id, id, name);
+	}
 }
 
 /****************************************************************************
   display the main navigation controls at the top of each page along
   with a title 
 ****************************************************************************/
-static void show_main_buttons(void)
+static void show_main_buttons(const char *page)
 {
 	char *p;
 	
-	if ((p = cgi_user_name()) && strcmp(p, "root")) {
-		printf(_("Logged in as <b>%s</b>"), p);
-		printf("<p>\n");
-	}
+	printf("  <div id=\"nav\">\n");
 
-	image_link(_("Home"), "", "images/home.gif");
 	if (have_write_access) {
-		image_link(_("Globals"), "globals", "images/globals.gif");
-		image_link(_("Shares"), "shares", "images/shares.gif");
-		image_link(_("Printers"), "printers", "images/printers.gif");
-		image_link(_("Wizard"), "wizard", "images/wizard.gif");
+		rollover_link(_("Configure"), "conf", page);
+		rollover_link(_("Services"), "services", page);
 	}
-   /* root always gets all buttons, otherwise look for -P */
+   
+	/* root always gets all buttons, otherwise look for -P */
 	if ( have_write_access || (!passwd_only && have_read_access) ) {
-		image_link(_("Status"), "status", "images/status.gif");
-		image_link(_("View Config"), "viewconfig", "images/viewconfig.gif");
+		rollover_link(_("Status"), "status", page);
+	}
+	rollover_link(_("Password Management"), "passwd", page);
+	
+	printf("  </div>\n\n");
+	
+	/* Wrap the rest in a control div */
+	printf("  <div id=\"controls\">\n\n");
+
+	if ((p = cgi_user_name()) && strcmp(p, "root")) {
+		printf(_("Logged in as <b>%s</b>"), p);
+		printf("<p>\n");
 	}
-	image_link(_("Password Management"), "passwd", "images/passwd.gif");
 
-	printf("<HR>\n");
 }
 
 /****************************************************************************
@@ -576,11 +584,47 @@ static void ViewModeBoxes(int mode)
 }
 
 /****************************************************************************
-  display a welcome page  
+  display a welcome page (Read-only users under passwd only get a unique welcome)
 ****************************************************************************/
 static void welcome_page(void)
 {
-	include_html("help/welcome.html");
+	if (passwd_only && !have_write_access) {
+		include_html("help/welcome_passwd_only.html");
+	} else {
+		include_html("help/welcome.html");
+	}
+}
+
+/****************************************************************************
+  display help page  
+****************************************************************************/
+static void help_page(void)
+{
+	include_html("help/docs.html");
+}
+
+/****************************************************************************
+  display shares and printers links from an overall services page
+****************************************************************************/
+static void services_page(void)
+{
+	printf("  <div class=\"whereto\">\n");
+	printf("    <h2>File and Printer Shares</h2>\n\n");
+	printf("    <p>Follow the links below to edit service-level parameters for file and printer shares.</p>\n");
+	printf("  </div>\n\n");
+
+	printf("  <div class=\"view_conf\"><a href=\"viewconfig\" onclick=\"openHelp(this.href); return false\">View smb.conf file</a></div>\n\n");
+
+	printf("  <div class=\"services_opts\">\n");
+	printf("    <ul>\n");
+	printf("      <li><a href=\"shares\">File Shares</a></li>\n");
+	printf("      <li><a href=\"printers\">Printer Shares</a></li>\n");
+	printf("    </ul>\n");
+	printf("  </div>\n\n");
+
+	printf("  <div>\n");
+	printf("    <p>Shares may also be added via the links above.</p>\n");
+	printf("  </div>\n\n");
 }
 
 /****************************************************************************
@@ -648,7 +692,9 @@ static void rewritecfg_file(void)
 {
 	commit_parameters(GLOBAL_SECTION_SNUM);
 	save_reload(0);
-	printf("<H2>%s</H2>\n", _("Note: smb.conf file has been read and rewritten"));
+	printf("<h2>Samba Configuration Saved</h2>");
+	printf("<p>%s</p>\n", _("Note: smb.conf file has been read and rewritten"));
+	printf("<p>Return to the <a href=\"javascript:history.go(-1)\">previous page</a>.\n");
 }
 
 /****************************************************************************
@@ -760,7 +806,7 @@ static void wizard_page(void)
 	printf("<form method=post action=wizard>\n");
 
 	if (have_write_access) {
-		printf("%s\n", _("The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."));
+		printf("%s\n", _("The &quot;Rewrite smb.conf file&quot; button will clear the smb.conf file of all default values and of comments."));
 		printf("%s", _("The same will happen if you press the commit button."));
 		printf("<br><br>\n");
 		printf("<center>");
@@ -820,14 +866,19 @@ static void wizard_page(void)
 
 
 /****************************************************************************
-  display a globals editing page  
+  display a conf page for editing global parameters 
 ****************************************************************************/
-static void globals_page(void)
+static void conf_page(void)
 {
 	unsigned int parm_filter = FLAG_BASIC;
 	int mode = 0;
 
-	printf("<H2>%s</H2>\n", _("Global Parameters"));
+	printf("  <div class=\"whereto\">\n");
+	printf("    <h2>Configuring Samba</h2>\n\n");
+	printf("    <p>The following menu allows for editing of global parameters affecting your Samba configuration.</p>\n");
+	printf("  </div>\n\n");
+
+	printf("  <div class=\"view_conf\"><a href=\"viewconfig\" onclick=\"openHelp(this.href); return false\">View smb.conf file</a></div>\n\n");
 
 	if (cgi_variable("Commit")) {
 		commit_parameters(GLOBAL_SECTION_SNUM);
@@ -841,7 +892,7 @@ static void globals_page(void)
 	if ( cgi_variable("AdvMode"))
 		mode = 1;
 
-	printf("<form name=\"swatform\" method=post action=globals>\n");
+	printf("<form name=\"swatform\" method=post action=conf>\n");
 
 	ViewModeBoxes( mode );
 	switch ( mode ) {
@@ -885,6 +936,8 @@ static void shares_page(void)
 		snum = lp_servicenumber(share);
 
 	printf("<H2>%s</H2>\n", _("Share Parameters"));
+	
+	printf("  <div class=\"view_conf\"><a href=\"services\">Return to Services Page</a><a href=\"viewconfig\" onclick=\"openHelp(this.href); return false\">View smb.conf file</a></div>\n\n");
 
 	if (cgi_variable("Commit") && snum >= 0) {
 		commit_parameters(snum);
@@ -1226,6 +1279,8 @@ static void printers_page(void)
 		snum = lp_servicenumber(share);
 
         printf("<H2>%s</H2>\n", _("Printer Parameters"));
+
+	printf("  <div class=\"view_conf\"><a href=\"services\">Return to Services Page</a><a href=\"viewconfig\" onclick=\"openHelp(this.href); return false\">View smb.conf file</a></div>\n\n");
  
         printf("<H3>%s</H3>\n", _("Important Note:"));
         printf(_("Printer names marked with [*] in the Choose Printer drop-down box "));
@@ -1395,29 +1450,32 @@ static void printers_page(void)
 		have_read_access = (access(dyn_CONFIGFILE,R_OK) == 0);
 	}
 
-	show_main_buttons();
-
 	page = cgi_pathinfo();
 
-	/* Root gets full functionality */
-	if (have_read_access && strcmp(page, "globals")==0) {
-		globals_page();
+	show_main_buttons(page);
+
+	if (have_read_access && strcmp(page,"conf")==0) { 
+		conf_page();
+	} else if (have_read_access && strcmp(page,"viewconfig")==0) {
+		viewconfig_page();
+	} else if (have_read_access && strcmp(page,"rewritecfg")==0) {
+		rewritecfg_file();
+	} else if (have_read_access && strcmp(page,"services")==0) {
+		services_page();
 	} else if (have_read_access && strcmp(page,"shares")==0) {
 		shares_page();
 	} else if (have_read_access && strcmp(page,"printers")==0) {
 		printers_page();
 	} else if (have_read_access && strcmp(page,"status")==0) {
 		status_page();
-	} else if (have_read_access && strcmp(page,"viewconfig")==0) {
-		viewconfig_page();
 	} else if (strcmp(page,"passwd")==0) {
 		passwd_page();
 	} else if (have_read_access && strcmp(page,"wizard")==0) {
 		wizard_page();
 	} else if (have_read_access && strcmp(page,"wizard_params")==0) {
 		wizard_params_page();
-	} else if (have_read_access && strcmp(page,"rewritecfg")==0) {
-		rewritecfg_file();
+	} else if (have_read_access && strcmp(page,"help")==0) {
+		help_page();
 	} else {
 		welcome_page();
 	}
-- 
cgit 


From 6d5757395a0e54245543794d0d6d6d6a32cd857a Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 5 Nov 2005 04:21:55 +0000
Subject: r11511: A classic "friday night check-in" :-). This moves much of the
 Samba4 timezone handling code back into Samba3. Gets rid of "kludge-gmt" and
 removes the effectiveness of the parameter "time offset" (I can add this back
 in very easily if needed) - it's no longer being looked at. I'm hoping this
 will fix the problems people have been having with DST transitions. I'll
 start comprehensive testing tomorrow, but for now all modifications are done.
 Splits time get/set functions into srv_XXX and cli_XXX as they need to look
 at different timezone offsets. Get rid of much of the "efficiency" cruft that
 was added to Samba back in the day when the C library timezone handling
 functions were slow. Jeremy. (This used to be commit
 414303bc0272f207046b471a0364fa296b67c1f8)

---
 source3/web/statuspage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index edc0318373..6447f95bac 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -101,7 +101,7 @@ static char *mapPid2Machine (struct process_id pid)
 static char *tstring(time_t t)
 {
 	static pstring buf;
-	pstrcpy(buf, asctime(LocalTime(&t)));
+	pstrcpy(buf, asctime(localtime(&t)));
 	all_string_sub(buf," ","&nbsp;",sizeof(buf));
 	return buf;
 }
-- 
cgit 


From 7d2771e758d4e8ef0adb45e55775b524de4dba9a Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 12 Dec 2005 22:07:36 +0000
Subject: r12203: Add the share path into the sharemode db. This involves
 revving the minor version number for libsmbsharemodes (we now have a new _ex
 interface that takes the share path as well as the filename). Needed for
 #3303. Some code written by SATOH Fumiyasu <fumiya@samba.gr.jp> included in
 the changes to locking/locking.c. The smbstatus output is a bit of a mess and
 needs overhauling... Jeremy. (This used to be commit
 9d93af713f8520ca506730dd32aa2b994937eaba)

---
 source3/web/statuspage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 6447f95bac..24d7eaf72e 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -106,7 +106,7 @@ static char *tstring(time_t t)
 	return buf;
 }
 
-static void print_share_mode(const struct share_mode_entry *e, char *fname)
+static void print_share_mode(const struct share_mode_entry *e, const char *sharepath, const char *fname)
 {
 	char           *utf8_fname;
 	int deny_mode = map_share_mode_to_deny_mode(e->share_access,
-- 
cgit 


From 67e8af8527d08d97736f9d1468d4ccd582940f44 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 20 Dec 2005 02:23:51 +0000
Subject: r12393: cleaning up swat bugs.  *no one* tests swat it seems.  This
 has been broken since r10656 (This used to be commit
 85ea7afd8bd30e0a2bcbc7181f75fde63b016a34)

---
 source3/web/diagnose.c |   4 +-
 source3/web/swat.c     | 142 +++++++++++++++----------------------------------
 2 files changed, 44 insertions(+), 102 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index c7a7a3598e..d259717da0 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -21,6 +21,8 @@
 #include "includes.h"
 #include "web/swat_proto.h"
 
+extern struct in_addr loopback_ip;
+
 #ifdef WITH_WINBIND
 
 /* check to see if winbind is running by pinging it */
@@ -35,7 +37,6 @@ BOOL winbindd_running(void)
    response */
 BOOL nmbd_running(void)
 {
-	extern struct in_addr loopback_ip;
 	int fd, count, flags;
 	struct in_addr *ip_list;
 
@@ -60,7 +61,6 @@ BOOL nmbd_running(void)
 BOOL smbd_running(void)
 {
 	static struct cli_state cli;
-	extern struct in_addr loopback_ip;
 
 	if (!cli_initialise(&cli))
 		return False;
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 4082574e44..15612484a3 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -188,12 +188,12 @@ static const char* get_parm_translated(
 	if(strcmp(pLabel, pTranslated) != 0)
 	{
 		pstr_sprintf(output,
-		  "<A HREF=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
+		  "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
 		   pAnchor, pHelp, pLabel, pTranslated);
 		return output;
 	}
 	pstr_sprintf(output, 
-	  "<a href=\"/swat/help/smb.conf.5.html#%s\" target=\"docs\" class=\"help_link\"> %s</a> %s",
+	  "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s",
 	  pAnchor, pHelp, pLabel);
 	return output;
 }
@@ -220,7 +220,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		ptr = lp_local_ptr(snum, ptr);
 	}
 
-	printf("<tr><td width=\"230\">%s</td><td>", get_parm_translated(stripspaceupper(parm->label), _("Help"), parm->label));
+	printf("<tr><td>%s</td><td>", get_parm_translated(stripspaceupper(parm->label), _("Help"), parm->label));
 	switch (parm->type) {
 	case P_CHAR:
 		printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",
@@ -230,7 +230,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		break;
 
 	case P_LIST:
-		printf("<input type=text size=30 name=\"parm_%s\" value=\"",
+		printf("<input type=text size=40 name=\"parm_%s\" value=\"",
 			make_parm_name(parm->label));
 		if ((char ***)ptr && *(char ***)ptr && **(char ***)ptr) {
 			char **list = *(char ***)ptr;
@@ -268,7 +268,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 	case P_STRING:
 	case P_USTRING:
 		push_utf8_allocate(&utf8_s1, *(char **)ptr);
-		printf("<input type=text size=30 name=\"parm_%s\" value=\"%s\">",
+		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
 		       make_parm_name(parm->label), fix_quotes(utf8_s1));
 		SAFE_FREE(utf8_s1);
 		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
@@ -278,7 +278,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 	case P_GSTRING:
 	case P_UGSTRING:
 		push_utf8_allocate(&utf8_s1, (char *)ptr);
-		printf("<input type=text size=30 name=\"parm_%s\" value=\"%s\">",
+		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
 		       make_parm_name(parm->label), fix_quotes(utf8_s1));
 		SAFE_FREE(utf8_s1);
 		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
@@ -523,50 +523,42 @@ static void commit_parameters(int snum)
 }
 
 /****************************************************************************
-  generate html for rollovers
+  spit out the html for a link with an image 
 ****************************************************************************/
-static void rollover_link(const char *name, const char *id, const char *page)
+static void image_link(const char *name, const char *hlink, const char *src)
 {
-	if ( strcmp(page, id)==0 ) {
-		printf("    <img src=\"/swat/images/%s_flat.png\" alt=\"%s\" />\n", 
-	       	   id, name);
-	} else {
-		printf("    <a href=\"%s/%s\" onmouseover=\"swapImg('%s','%sOver')\" onmouseout=\"swapImg('%s','%sLink')\"><img src=\"/swat/images/%s_link.png\" name=\"%s\" alt=\"%s\" /></a>\n",
-	       cgi_baseurl(), id, id, id, id, id, id, id, name);
-	}
+	printf("<A HREF=\"%s/%s\"><img border=\"0\" src=\"/swat/%s\" alt=\"%s\"></A>\n", 
+	       cgi_baseurl(), hlink, src, name);
 }
 
 /****************************************************************************
   display the main navigation controls at the top of each page along
   with a title 
 ****************************************************************************/
-static void show_main_buttons(const char *page)
+static void show_main_buttons(void)
 {
 	char *p;
 	
-	printf("  <div id=\"nav\">\n");
+	if ((p = cgi_user_name()) && strcmp(p, "root")) {
+		printf(_("Logged in as <b>%s</b>"), p);
+		printf("<p>\n");
+	}
 
+	image_link(_("Home"), "", "images/home.gif");
 	if (have_write_access) {
-		rollover_link(_("Configure"), "conf", page);
-		rollover_link(_("Services"), "services", page);
+		image_link(_("Globals"), "globals", "images/globals.gif");
+		image_link(_("Shares"), "shares", "images/shares.gif");
+		image_link(_("Printers"), "printers", "images/printers.gif");
+		image_link(_("Wizard"), "wizard", "images/wizard.gif");
 	}
-   
-	/* root always gets all buttons, otherwise look for -P */
+   /* root always gets all buttons, otherwise look for -P */
 	if ( have_write_access || (!passwd_only && have_read_access) ) {
-		rollover_link(_("Status"), "status", page);
-	}
-	rollover_link(_("Password Management"), "passwd", page);
-	
-	printf("  </div>\n\n");
-	
-	/* Wrap the rest in a control div */
-	printf("  <div id=\"controls\">\n\n");
-
-	if ((p = cgi_user_name()) && strcmp(p, "root")) {
-		printf(_("Logged in as <b>%s</b>"), p);
-		printf("<p>\n");
+		image_link(_("Status"), "status", "images/status.gif");
+		image_link(_("View Config"), "viewconfig", "images/viewconfig.gif");
 	}
+	image_link(_("Password Management"), "passwd", "images/passwd.gif");
 
+	printf("<HR>\n");
 }
 
 /****************************************************************************
@@ -584,47 +576,11 @@ static void ViewModeBoxes(int mode)
 }
 
 /****************************************************************************
-  display a welcome page (Read-only users under passwd only get a unique welcome)
+  display a welcome page  
 ****************************************************************************/
 static void welcome_page(void)
 {
-	if (passwd_only && !have_write_access) {
-		include_html("help/welcome_passwd_only.html");
-	} else {
-		include_html("help/welcome.html");
-	}
-}
-
-/****************************************************************************
-  display help page  
-****************************************************************************/
-static void help_page(void)
-{
-	include_html("help/docs.html");
-}
-
-/****************************************************************************
-  display shares and printers links from an overall services page
-****************************************************************************/
-static void services_page(void)
-{
-	printf("  <div class=\"whereto\">\n");
-	printf("    <h2>File and Printer Shares</h2>\n\n");
-	printf("    <p>Follow the links below to edit service-level parameters for file and printer shares.</p>\n");
-	printf("  </div>\n\n");
-
-	printf("  <div class=\"view_conf\"><a href=\"viewconfig\" onclick=\"openHelp(this.href); return false\">View smb.conf file</a></div>\n\n");
-
-	printf("  <div class=\"services_opts\">\n");
-	printf("    <ul>\n");
-	printf("      <li><a href=\"shares\">File Shares</a></li>\n");
-	printf("      <li><a href=\"printers\">Printer Shares</a></li>\n");
-	printf("    </ul>\n");
-	printf("  </div>\n\n");
-
-	printf("  <div>\n");
-	printf("    <p>Shares may also be added via the links above.</p>\n");
-	printf("  </div>\n\n");
+	include_html("help/welcome.html");
 }
 
 /****************************************************************************
@@ -692,9 +648,7 @@ static void rewritecfg_file(void)
 {
 	commit_parameters(GLOBAL_SECTION_SNUM);
 	save_reload(0);
-	printf("<h2>Samba Configuration Saved</h2>");
-	printf("<p>%s</p>\n", _("Note: smb.conf file has been read and rewritten"));
-	printf("<p>Return to the <a href=\"javascript:history.go(-1)\">previous page</a>.\n");
+	printf("<H2>%s</H2>\n", _("Note: smb.conf file has been read and rewritten"));
 }
 
 /****************************************************************************
@@ -806,7 +760,7 @@ static void wizard_page(void)
 	printf("<form method=post action=wizard>\n");
 
 	if (have_write_access) {
-		printf("%s\n", _("The &quot;Rewrite smb.conf file&quot; button will clear the smb.conf file of all default values and of comments."));
+		printf("%s\n", _("The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."));
 		printf("%s", _("The same will happen if you press the commit button."));
 		printf("<br><br>\n");
 		printf("<center>");
@@ -866,19 +820,14 @@ static void wizard_page(void)
 
 
 /****************************************************************************
-  display a conf page for editing global parameters 
+  display a globals editing page  
 ****************************************************************************/
-static void conf_page(void)
+static void globals_page(void)
 {
 	unsigned int parm_filter = FLAG_BASIC;
 	int mode = 0;
 
-	printf("  <div class=\"whereto\">\n");
-	printf("    <h2>Configuring Samba</h2>\n\n");
-	printf("    <p>The following menu allows for editing of global parameters affecting your Samba configuration.</p>\n");
-	printf("  </div>\n\n");
-
-	printf("  <div class=\"view_conf\"><a href=\"viewconfig\" onclick=\"openHelp(this.href); return false\">View smb.conf file</a></div>\n\n");
+	printf("<H2>%s</H2>\n", _("Global Parameters"));
 
 	if (cgi_variable("Commit")) {
 		commit_parameters(GLOBAL_SECTION_SNUM);
@@ -892,7 +841,7 @@ static void conf_page(void)
 	if ( cgi_variable("AdvMode"))
 		mode = 1;
 
-	printf("<form name=\"swatform\" method=post action=conf>\n");
+	printf("<form name=\"swatform\" method=post action=globals>\n");
 
 	ViewModeBoxes( mode );
 	switch ( mode ) {
@@ -936,8 +885,6 @@ static void shares_page(void)
 		snum = lp_servicenumber(share);
 
 	printf("<H2>%s</H2>\n", _("Share Parameters"));
-	
-	printf("  <div class=\"view_conf\"><a href=\"services\">Return to Services Page</a><a href=\"viewconfig\" onclick=\"openHelp(this.href); return false\">View smb.conf file</a></div>\n\n");
 
 	if (cgi_variable("Commit") && snum >= 0) {
 		commit_parameters(snum);
@@ -1279,8 +1226,6 @@ static void printers_page(void)
 		snum = lp_servicenumber(share);
 
         printf("<H2>%s</H2>\n", _("Printer Parameters"));
-
-	printf("  <div class=\"view_conf\"><a href=\"services\">Return to Services Page</a><a href=\"viewconfig\" onclick=\"openHelp(this.href); return false\">View smb.conf file</a></div>\n\n");
  
         printf("<H3>%s</H3>\n", _("Important Note:"));
         printf(_("Printer names marked with [*] in the Choose Printer drop-down box "));
@@ -1450,32 +1395,29 @@ static void printers_page(void)
 		have_read_access = (access(dyn_CONFIGFILE,R_OK) == 0);
 	}
 
-	page = cgi_pathinfo();
+	show_main_buttons();
 
-	show_main_buttons(page);
+	page = cgi_pathinfo();
 
-	if (have_read_access && strcmp(page,"conf")==0) { 
-		conf_page();
-	} else if (have_read_access && strcmp(page,"viewconfig")==0) {
-		viewconfig_page();
-	} else if (have_read_access && strcmp(page,"rewritecfg")==0) {
-		rewritecfg_file();
-	} else if (have_read_access && strcmp(page,"services")==0) {
-		services_page();
+	/* Root gets full functionality */
+	if (have_read_access && strcmp(page, "globals")==0) {
+		globals_page();
 	} else if (have_read_access && strcmp(page,"shares")==0) {
 		shares_page();
 	} else if (have_read_access && strcmp(page,"printers")==0) {
 		printers_page();
 	} else if (have_read_access && strcmp(page,"status")==0) {
 		status_page();
+	} else if (have_read_access && strcmp(page,"viewconfig")==0) {
+		viewconfig_page();
 	} else if (strcmp(page,"passwd")==0) {
 		passwd_page();
 	} else if (have_read_access && strcmp(page,"wizard")==0) {
 		wizard_page();
 	} else if (have_read_access && strcmp(page,"wizard_params")==0) {
 		wizard_params_page();
-	} else if (have_read_access && strcmp(page,"help")==0) {
-		help_page();
+	} else if (have_read_access && strcmp(page,"rewritecfg")==0) {
+		rewritecfg_file();
 	} else {
 		welcome_page();
 	}
-- 
cgit 


From 5a4881bf396e691524329bcd6aa1ae4a7f4084ec Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 27 Dec 2005 20:52:36 +0000
Subject: r12522: Try and fix bug #2926 by removing setlocale(LC_ALL, "C") and
 replace calls to isupper/islower/toupper/tolower with ASCII equivalents
 (mapping into _w variants). Jeremy. (This used to be commit
 c2752347eb2deeb2798c580ec7fc751a847717e9)

---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 15612484a3..3806291a6a 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -103,7 +103,7 @@ static char *stripspaceupper(const char *str)
 	char *p = newstring;
 
 	while (*str) {
-		if (*str != ' ') *p++ = toupper(*str);
+		if (*str != ' ') *p++ = toupper_ascii(*str);
 		++str;
 	}
 	*p = '\0';
-- 
cgit 


From 1a423304cc1c17a28065a95e3bac1aa9403bd630 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 25 Jan 2006 21:58:06 +0000
Subject: r13140: Fix swat - make sure it can list running services (ensure
 loopback_ip) is defined. Jerry - this needs to be in 3.0.21b. Jeremy. (This
 used to be commit 417ef5bffaefee698cbea4b06aff691f01ac56d1)

---
 source3/web/swat.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 3806291a6a..372d473bdb 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1373,6 +1373,7 @@ static void printers_page(void)
 
 	setup_logging(argv[0],False);
 	load_config(True);
+	load_interfaces();
 	iNumNonAutoPrintServices = lp_numservices();
 	load_printers();
 
-- 
cgit 


From 9c15bd311db76885b27f30ba92d885833f668550 Mon Sep 17 00:00:00 2001
From: Derrell Lipman <derrell@samba.org>
Date: Sat, 28 Jan 2006 22:53:04 +0000
Subject: r13212:  r12414@cabra:  derrell | 2006-01-28 17:52:17 -0500 
 lp_load() could not be called multiple times to modify parameter settings
 based  on reading from multiple configuration settings.  Each time, it
 initialized all  of the settings back to their defaults before reading the
 specified  configuration file.

 This patch adds a parameter to lp_load() specifying whether the settings should
 be initialized.  It does, however, still force the settings to be initialized
 the first time, even if the request was to not initialize them.  (Not doing so
 could wreak havoc due to uninitialized values.)
(This used to be commit f2a24de769d1b2266e576597c57a8e3b1e2a2b51)
---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 372d473bdb..63253e41c4 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -422,7 +422,7 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
 static BOOL load_config(BOOL save_def)
 {
 	lp_resetnumservices();
-	return lp_load(dyn_CONFIGFILE,False,save_def,False);
+	return lp_load(dyn_CONFIGFILE,False,save_def,False,True);
 }
 
 /****************************************************************************
-- 
cgit 


From 0e551cd5a2f468ad297f1bfbccbc9f91579dc794 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 31 Jan 2006 21:54:24 +0000
Subject: r13262: Arrgggg. Fix smbstatus and swat status to ignore bloody
 placeholder share mode entries (I hate these - I've had to add this filter
 code now to too many places :-). Jeremy. (This used to be commit
 815340e1a413f98c1c36aacc1c34041e9160d0e3)

---
 source3/web/statuspage.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 24d7eaf72e..7430f4ebf5 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -109,7 +109,13 @@ static char *tstring(time_t t)
 static void print_share_mode(const struct share_mode_entry *e, const char *sharepath, const char *fname)
 {
 	char           *utf8_fname;
-	int deny_mode = map_share_mode_to_deny_mode(e->share_access,
+	int deny_mode;
+
+	if (!is_valid_share_mode_entry(e)) {
+		return;
+	}
+
+	deny_mode = map_share_mode_to_deny_mode(e->share_access,
 						    e->private_options);
 
 	printf("<tr><td>%s</td>",_(mapPid2Machine(e->pid)));
-- 
cgit 


From 0af1500fc0bafe61019f1b2ab1d9e1d369221240 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 3 Feb 2006 22:19:41 +0000
Subject: r13316: Let the carnage begin.... Sync with trunk as off r13315 (This
 used to be commit 17e63ac4ed8325c0d44fe62b2442449f3298559f)

---
 source3/web/cgi.c  | 10 +++++-----
 source3/web/swat.c |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 6c9cfce13c..700fb7fa08 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -293,7 +293,7 @@ static void cgi_web_auth(void)
 		exit(0);
 	}
 
-	pwd = getpwnam_alloc(user);
+	pwd = getpwnam_alloc(NULL, user);
 	if (!pwd) {
 		printf("%sCannot find user %s<br>%s\n", head, user, tail);
 		exit(0);
@@ -306,7 +306,7 @@ static void cgi_web_auth(void)
 		       head, user, (int)geteuid(), (int)getuid(), tail);
 		exit(0);
 	}
-	passwd_free(&pwd);
+	talloc_free(pwd);
 }
 
 
@@ -346,7 +346,7 @@ static BOOL cgi_handle_authorization(char *line)
 	 * Try and get the user from the UNIX password file.
 	 */
 	
-	pass = getpwnam_alloc(user);
+	pass = getpwnam_alloc(NULL, user);
 	
 	/*
 	 * Validate the password they have given.
@@ -367,7 +367,7 @@ static BOOL cgi_handle_authorization(char *line)
 			
 			/* Save the users name */
 			C_user = SMB_STRDUP(user);
-			passwd_free(&pass);
+			talloc_free(pass);
 			return True;
 		}
 	}
@@ -377,7 +377,7 @@ err:
 			"WWW-Authenticate: Basic realm=\"SWAT\"\r\n",
 			"username or password incorrect");
 
-	passwd_free(&pass);
+	talloc_free(pass);
 	return False;
 }
 
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 63253e41c4..af01d1f31b 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -982,7 +982,7 @@ static BOOL change_password(const char *remote_machine, const char *user_name,
 			    const char *old_passwd, const char *new_passwd, 
 				int local_flags)
 {
-	BOOL ret = False;
+	NTSTATUS ret;
 	pstring err_str;
 	pstring msg_str;
 
@@ -996,7 +996,7 @@ static BOOL change_password(const char *remote_machine, const char *user_name,
 									 new_passwd, err_str, sizeof(err_str));
 		if(*err_str)
 			printf("%s\n<p>", err_str);
-		return ret;
+		return NT_STATUS_IS_OK(ret);
 	}
 
 	if(!initialize_password_db(True)) {
@@ -1012,7 +1012,7 @@ static BOOL change_password(const char *remote_machine, const char *user_name,
 	if(*err_str)
 		printf("%s\n<p>", err_str);
 
-	return ret;
+	return NT_STATUS_IS_OK(ret);
 }
 
 /****************************************************************************
-- 
cgit 


From 4379662d91b77c76aa41e054499b9a1707f1d1af Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 8 Feb 2006 04:05:34 +0000
Subject: r13383: pulling in swat-welcome patch from SuSE packaging (This used
 to be commit 1b955bbf59e5b11014405d888d58fefbc055ad38)

---
 source3/web/swat.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index af01d1f31b..cbf5ba8989 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -580,7 +580,11 @@ static void ViewModeBoxes(int mode)
 ****************************************************************************/
 static void welcome_page(void)
 {
-	include_html("help/welcome.html");
+	if (file_exist("help/welcome.html", NULL)) {
+		include_html("help/welcome.html");
+	} else {
+		include_html("help/welcome-no-samba-doc.html");
+	}
 }
 
 /****************************************************************************
-- 
cgit 


From fb5362c069b5b6548478b2217a0519c56d856705 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Mon, 20 Feb 2006 17:59:58 +0000
Subject: r13571: Replace all calls to talloc_free() with thye TALLOC_FREE()
 macro which sets the freed pointer to NULL. (This used to be commit
 b65be8874a2efe5a4b167448960a4fcf6bd995e2)

---
 source3/web/cgi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 700fb7fa08..d1cd38eb51 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -306,7 +306,7 @@ static void cgi_web_auth(void)
 		       head, user, (int)geteuid(), (int)getuid(), tail);
 		exit(0);
 	}
-	talloc_free(pwd);
+	TALLOC_FREE(pwd);
 }
 
 
@@ -367,7 +367,7 @@ static BOOL cgi_handle_authorization(char *line)
 			
 			/* Save the users name */
 			C_user = SMB_STRDUP(user);
-			talloc_free(pass);
+			TALLOC_FREE(pass);
 			return True;
 		}
 	}
@@ -377,7 +377,7 @@ err:
 			"WWW-Authenticate: Basic realm=\"SWAT\"\r\n",
 			"username or password incorrect");
 
-	talloc_free(pass);
+	TALLOC_FREE(pass);
 	return False;
 }
 
-- 
cgit 


From 894358a8f3e338b339b6c37233edef794b312087 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 7 Mar 2006 06:31:04 +0000
Subject: r13915: Fixed a very interesting class of realloc() bugs found by
 Coverity. realloc can return NULL in one of two cases - (1) the realloc
 failed, (2) realloc succeeded but the new size requested was zero, in which
 case this is identical to a free() call.

The error paths dealing with these two cases should be different,
but mostly weren't. Secondly the standard idiom for dealing with
realloc when you know the new size is non-zero is the following :

 tmp = realloc(p, size);
 if (!tmp) {
    SAFE_FREE(p);
    return error;
 } else {
    p = tmp;
 }

However, there were *many* *many* places in Samba where we were
using the old (broken) idiom of :

 p = realloc(p, size)
 if (!p) {
    return error;
 }

which will leak the memory pointed to by p on realloc fail.

This commit (hopefully) fixes all these cases by moving to
a standard idiom of :

 p = SMB_REALLOC(p, size)
 if (!p) {
    return error;
 }

Where if the realloc returns null due to the realloc failing
or size == 0 we *guarentee* that the storage pointed to by p
has been freed. This allows me to remove a lot of code that
was dealing with the standard (more verbose) method that required
a tmp pointer. This is almost always what you want. When a
realloc fails you never usually want the old memory, you
want to free it and get into your error processing asap.

For the 11 remaining cases where we really do need to keep the
old pointer I have invented the new macro SMB_REALLOC_KEEP_OLD_ON_ERROR,
which can be used as follows :

 tmp = SMB_REALLOC_KEEP_OLD_ON_ERROR(p, size);
 if (!tmp) {
    SAFE_FREE(p);
    return error;
 } else {
    p = tmp;
 }

SMB_REALLOC_KEEP_OLD_ON_ERROR guarentees never to free the
pointer p, even on size == 0 or realloc fail. All this is
done by a hidden extra argument to Realloc(), BOOL free_old_on_error
which is set appropriately by the SMB_REALLOC and SMB_REALLOC_KEEP_OLD_ON_ERROR
macros (and their array counterparts).

It remains to be seen what this will do to our Coverity bug count :-).

Jeremy.
(This used to be commit 1d710d06a214f3f1740e80e0bffd6aab44aac2b0)
---
 source3/web/cgi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index d1cd38eb51..b764b6d628 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -59,7 +59,7 @@ static char *grab_line(FILE *f, int *cl)
 			char *ret2;
 			if (len == 0) len = 1024;
 			else len *= 2;
-			ret2 = (char *)SMB_REALLOC(ret, len);
+			ret2 = (char *)SMB_REALLOC_KEEP_OLD_ON_ERROR(ret, len);
 			if (!ret2) return ret;
 			ret = ret2;
 		}
-- 
cgit 


From a156d128f2bd5ea8ff9c1b5a4927ad3b82956fa8 Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@samba.org>
Date: Sat, 11 Mar 2006 10:23:02 +0000
Subject: r14204: Remove the basically unused P_GSTRING and P_UGSTRING
 parameter types. (This used to be commit
 23328fe6fc5e3b4ed3dc35e1475d661a8593eb1a)

---
 source3/web/swat.c | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index cbf5ba8989..3800a1db7f 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -275,16 +275,6 @@ static void show_parameter(int snum, struct parm_struct *parm)
 			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
 		break;
 
-	case P_GSTRING:
-	case P_UGSTRING:
-		push_utf8_allocate(&utf8_s1, (char *)ptr);
-		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
-		       make_parm_name(parm->label), fix_quotes(utf8_s1));
-		SAFE_FREE(utf8_s1);
-		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
-			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
-		break;
-
 	case P_BOOL:
 		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
 		printf("<option %s>Yes", (*(BOOL *)ptr)?"selected":"");
@@ -378,11 +368,6 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
 					if (!strcmp(*(char **)ptr,(char *)(parm->def.svalue))) continue;
 					break;
 
-				case P_GSTRING:
-				case P_UGSTRING:
-					if (!strcmp((char *)ptr,(char *)(parm->def.svalue))) continue;
-					break;
-
 				case P_BOOL:
 				case P_BOOLREV:
 					if (*(BOOL *)ptr == (BOOL)(parm->def.bvalue)) continue;
-- 
cgit 


From d245d5c0171c918f2d691160aecde43608bf2264 Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@samba.org>
Date: Sun, 12 Mar 2006 22:27:01 +0000
Subject: r14255: Revert r14204 which was horribly broken. (This used to be
 commit 950ed28f9f3f57dc449bd3bd6e7be7acb1e3d26d)

---
 source3/web/swat.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 3800a1db7f..cbf5ba8989 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -275,6 +275,16 @@ static void show_parameter(int snum, struct parm_struct *parm)
 			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
 		break;
 
+	case P_GSTRING:
+	case P_UGSTRING:
+		push_utf8_allocate(&utf8_s1, (char *)ptr);
+		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
+		       make_parm_name(parm->label), fix_quotes(utf8_s1));
+		SAFE_FREE(utf8_s1);
+		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
+		break;
+
 	case P_BOOL:
 		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
 		printf("<option %s>Yes", (*(BOOL *)ptr)?"selected":"");
@@ -368,6 +378,11 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
 					if (!strcmp(*(char **)ptr,(char *)(parm->def.svalue))) continue;
 					break;
 
+				case P_GSTRING:
+				case P_UGSTRING:
+					if (!strcmp((char *)ptr,(char *)(parm->def.svalue))) continue;
+					break;
+
 				case P_BOOL:
 				case P_BOOLREV:
 					if (*(BOOL *)ptr == (BOOL)(parm->def.bvalue)) continue;
-- 
cgit 


From 250c02554ec3dd52f33e33406fdd605f5d932d5f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 21 Mar 2006 13:16:50 +0000
Subject: r14618: add --no-process-group to all server programms to make the
 following possible:

timelimit 20000 bin/nmbd -F -S --no-process-group
timelimit 20000 bin/smbd -F -S --no-process-group

this is needed to 'make test' working without losing child processes

metze
(This used to be commit c3a9f30e2a12cc852c9fa3a7d161f5c6ee0694ce)
---
 source3/web/startstop.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 8f28748918..44945cd536 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -36,7 +36,7 @@ void start_smbd(void)
 
 	slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", dyn_SBINDIR);
 
-	become_daemon(True);
+	become_daemon(True, False);
 
 	execl(binfile, binfile, "-D", NULL);
 
@@ -56,7 +56,7 @@ void start_nmbd(void)
 
 	slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", dyn_SBINDIR);
 	
-	become_daemon(True);
+	become_daemon(True, False);
 
 	execl(binfile, binfile, "-D", NULL);
 
@@ -76,7 +76,7 @@ void start_winbindd(void)
 
 	slprintf(binfile, sizeof(pstring) - 1, "%s/winbindd", dyn_SBINDIR);
 
-	become_daemon(True);
+	become_daemon(True, False);
 
 	execl(binfile, binfile, NULL);
 
-- 
cgit 


From e805b87e5ff6c0359b84727fe69e287e14890c02 Mon Sep 17 00:00:00 2001
From: Deryck Hodge <deryck@samba.org>
Date: Fri, 5 May 2006 21:28:16 +0000
Subject: r15465: Fix segfault in SWAT. Fixes bug #3702.

deryck
(This used to be commit 4ad7276cef02b28308446c0eb76ea1190ffe9b05)
---
 source3/web/swat.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index cbf5ba8989..a0dc0f4d31 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1375,6 +1375,8 @@ static void printers_page(void)
 
 	poptFreeContext(pc);
 
+	load_case_tables();
+
 	setup_logging(argv[0],False);
 	load_config(True);
 	load_interfaces();
-- 
cgit 


From a1e0a0e9286fbe90ca04cda9df38e72d8d18b0c1 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 14 Jun 2006 21:36:49 +0000
Subject: r16230: Fix Klocwork #861 and others. localtime and asctime can
 return NULL. Ensure we check all returns correctly. Jeremy. (This used to be
 commit 6c61dc8ed6d84f310ef391fb7700e93ef42c4afc)

---
 source3/web/statuspage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 7430f4ebf5..769ab217b3 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -101,7 +101,7 @@ static char *mapPid2Machine (struct process_id pid)
 static char *tstring(time_t t)
 {
 	static pstring buf;
-	pstrcpy(buf, asctime(localtime(&t)));
+	pstrcpy(buf, time_to_asc(&t));
 	all_string_sub(buf," ","&nbsp;",sizeof(buf));
 	return buf;
 }
-- 
cgit 


From 4340b7cea74203799f7cd5d2457cbe062b42425c Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 20 Jun 2006 19:21:14 +0000
Subject: r16426: Klocwork #1544, #1545, #1546, #1549, #1550, #1552, #1553,
 #1554 Jeremy. (This used to be commit
 e71cc6647a2eaba0eac95b6abb40745e45db72a4)

---
 source3/web/cgi.c  | 15 +++++++++++++++
 source3/web/swat.c | 40 ++++++++++++++++++++--------------------
 2 files changed, 35 insertions(+), 20 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index b764b6d628..d289613b4b 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -223,6 +223,7 @@ void cgi_load_variables(void)
   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;
@@ -233,6 +234,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
   ***************************************************************************/
diff --git a/source3/web/swat.c b/source3/web/swat.c
index a0dc0f4d31..d1fd0b4f9b 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -515,7 +515,7 @@ static void commit_parameters(int snum)
 
 	while ((parm = lp_next_parameter(snum, &i, 1))) {
 		slprintf(label, sizeof(label)-1, "parm_%s", make_parm_name(parm->label));
-		if ((v = cgi_variable(label))) {
+		if ((v = cgi_variable(label)) != NULL) {
 			if (parm->flags & FLAG_HIDE) continue;
 			commit_parameter(snum, parm, v); 
 		}
@@ -678,10 +678,10 @@ static void wizard_page(void)
 	}
 
 	if (cgi_variable("Commit")){
-		SerType = atoi(cgi_variable("ServerType"));
-		winstype = atoi(cgi_variable("WINSType"));
+		SerType = atoi(cgi_variable_nonull("ServerType"));
+		winstype = atoi(cgi_variable_nonull("WINSType"));
 		have_home = lp_servicenumber(HOMES_NAME);
-		HomeExpo = atoi(cgi_variable("HomeExpo"));
+		HomeExpo = atoi(cgi_variable_nonull("HomeExpo"));
 
 		/* Plain text passwords are too badly broken - use encrypted passwords only */
 		lp_do_parameter( GLOBAL_SECTION_SNUM, "encrypt passwords", "Yes");
@@ -714,7 +714,7 @@ static void wizard_page(void)
 				break;
 			case 2:
 				lp_do_parameter( GLOBAL_SECTION_SNUM, "wins support", "No" );
-				lp_do_parameter( GLOBAL_SECTION_SNUM, "wins server", cgi_variable("WINSAddr"));
+				lp_do_parameter( GLOBAL_SECTION_SNUM, "wins server", cgi_variable_nonull("WINSAddr"));
 				break;
 		}
 
@@ -839,7 +839,7 @@ static void globals_page(void)
 	}
 
 	if ( cgi_variable("ViewMode") )
-		mode = atoi(cgi_variable("ViewMode"));
+		mode = atoi(cgi_variable_nonull("ViewMode"));
 	if ( cgi_variable("BasicMode"))
 		mode = 0;
 	if ( cgi_variable("AdvMode"))
@@ -915,7 +915,7 @@ static void shares_page(void)
 	printf("<table>\n");
 
 	if ( cgi_variable("ViewMode") )
-		mode = atoi(cgi_variable("ViewMode"));
+		mode = atoi(cgi_variable_nonull("ViewMode"));
 	if ( cgi_variable("BasicMode"))
 		mode = 0;
 	if ( cgi_variable("AdvMode"))
@@ -1029,7 +1029,7 @@ static void chg_passwd(void)
 	int local_flags = 0;
 
 	/* Make sure users name has been specified */
-	if (strlen(cgi_variable(SWAT_USER)) == 0) {
+	if (strlen(cgi_variable_nonull(SWAT_USER)) == 0) {
 		printf("<p>%s\n", _(" Must specify \"User Name\" "));
 		return;
 	}
@@ -1044,27 +1044,27 @@ static void chg_passwd(void)
 		 * If current user is not root, make sure old password has been specified 
 		 * If REMOTE change, even root must provide old password 
 		 */
-		if (((!am_root()) && (strlen( cgi_variable(OLD_PSWD)) <= 0)) ||
-		    ((cgi_variable(CHG_R_PASSWD_FLAG)) &&  (strlen( cgi_variable(OLD_PSWD)) <= 0))) {
+		if (((!am_root()) && (strlen( cgi_variable_nonull(OLD_PSWD)) <= 0)) ||
+		    ((cgi_variable(CHG_R_PASSWD_FLAG)) &&  (strlen( cgi_variable_nonull(OLD_PSWD)) <= 0))) {
 			printf("<p>%s\n", _(" Must specify \"Old Password\" "));
 			return;
 		}
 
 		/* If changing a users password on a remote hosts we have to know what host */
-		if ((cgi_variable(CHG_R_PASSWD_FLAG)) && (strlen( cgi_variable(RHOST)) <= 0)) {
+		if ((cgi_variable(CHG_R_PASSWD_FLAG)) && (strlen( cgi_variable_nonull(RHOST)) <= 0)) {
 			printf("<p>%s\n", _(" Must specify \"Remote Machine\" "));
 			return;
 		}
 
 		/* Make sure new passwords have been specified */
-		if ((strlen( cgi_variable(NEW_PSWD)) <= 0) ||
-		    (strlen( cgi_variable(NEW2_PSWD)) <= 0)) {
+		if ((strlen( cgi_variable_nonull(NEW_PSWD)) <= 0) ||
+		    (strlen( cgi_variable_nonull(NEW2_PSWD)) <= 0)) {
 			printf("<p>%s\n", _(" Must specify \"New, and Re-typed Passwords\" "));
 			return;
 		}
 
 		/* Make sure new passwords was typed correctly twice */
-		if (strcmp(cgi_variable(NEW_PSWD), cgi_variable(NEW2_PSWD)) != 0) {
+		if (strcmp(cgi_variable_nonull(NEW_PSWD), cgi_variable_nonull(NEW2_PSWD)) != 0) {
 			printf("<p>%s\n", _(" Re-typed password didn't match new password "));
 			return;
 		}
@@ -1091,17 +1091,17 @@ static void chg_passwd(void)
 	
 
 	rslt = change_password(host,
-			       cgi_variable(SWAT_USER),
-			       cgi_variable(OLD_PSWD), cgi_variable(NEW_PSWD),
+			       cgi_variable_nonull(SWAT_USER),
+			       cgi_variable_nonull(OLD_PSWD), cgi_variable_nonull(NEW_PSWD),
 				   local_flags);
 
 	if(cgi_variable(CHG_S_PASSWD_FLAG)) {
 		printf("<p>");
 		if (rslt == True) {
-			printf(_(" The passwd for '%s' has been changed."), cgi_variable(SWAT_USER));
+			printf(_(" The passwd for '%s' has been changed."), cgi_variable_nonull(SWAT_USER));
 			printf("\n");
 		} else {
-			printf(_(" The passwd for '%s' has NOT been changed."), cgi_variable(SWAT_USER));
+			printf(_(" The passwd for '%s' has NOT been changed."), cgi_variable_nonull(SWAT_USER));
 			printf("\n");
 		}
 	}
@@ -1121,7 +1121,7 @@ static void passwd_page(void)
 	 * changed the User box text to another users name, remember it.
 	 */
 	if (cgi_variable(SWAT_USER)) {
-		new_name = cgi_variable(SWAT_USER);
+		new_name = cgi_variable_nonull(SWAT_USER);
 	} 
 
 	if (!new_name) new_name = "";
@@ -1265,7 +1265,7 @@ static void printers_page(void)
 	printf("<FORM name=\"swatform\" method=post>\n");
 
 	if ( cgi_variable("ViewMode") )
-		mode = atoi(cgi_variable("ViewMode"));
+		mode = atoi(cgi_variable_nonull("ViewMode"));
         if ( cgi_variable("BasicMode"))
                 mode = 0;
         if ( cgi_variable("AdvMode"))
-- 
cgit 


From 54ea3c23e3bfd25008198e85fdcc1f48b0325eab Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 21 Jun 2006 02:31:12 +0000
Subject: r16435: Add in the uid info that Jerry needs into the share_mode
 struct. Allows us to know the unix uid of the opener of the file/directory.
 Needed for info level queries on open files. Jeremy. (This used to be commit
 d929323d6f513902381369d77bcd7b714346d713)

---
 source3/web/statuspage.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 769ab217b3..cb6fa91171 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -119,6 +119,7 @@ static void print_share_mode(const struct share_mode_entry *e, const char *share
 						    e->private_options);
 
 	printf("<tr><td>%s</td>",_(mapPid2Machine(e->pid)));
+	printf("<td>%u</td>",(unsigned int)e->uid);
 	printf("<td>");
 	switch ((deny_mode>>4)&0xF) {
 	case DENY_NONE: printf("DENY_NONE"); break;
-- 
cgit 


From 9f4c335401e5e34f290295c0b36e193d0b0f43ff Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 28 Jun 2006 01:59:04 +0000
Subject: r16597: Klocwork #2006. Fix possible null deref. Jeremy. (This used
 to be commit 9b73385d6b90c7806d8ccfc1f2354ede761fad61)

---
 source3/web/neg_lang.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index ca671822d8..fb79f41f13 100644
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -86,6 +86,10 @@ void web_set_lang(const char *lang_string)
 		lang_num++;
 	}
 	pl = SMB_MALLOC_ARRAY(struct pri_list, lang_num);
+	if (!pl) {
+		return;
+	}
+
 	for (i = 0; i < lang_num; i++) {
 		char *pri_code;
 		if ((pri_code=strstr(lang_list[i], ";q="))) {
-- 
cgit 


From fbdcf2663b56007a438ac4f0d8d82436b1bfe688 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 11 Jul 2006 18:01:26 +0000
Subject: r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper
 layer directories but this is what everyone is waiting for....

Jeremy.
(This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
---
 source3/web/diagnose.c | 10 +++++-----
 source3/web/neg_lang.c |  4 ++--
 source3/web/swat.c     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index d259717da0..b53e139ca9 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -60,16 +60,16 @@ BOOL nmbd_running(void)
    then closing it */
 BOOL smbd_running(void)
 {
-	static struct cli_state cli;
+	struct cli_state *cli;
 
-	if (!cli_initialise(&cli))
+	if ((cli = cli_initialise()) == NULL)
 		return False;
 
-	if (!cli_connect(&cli, global_myname(), &loopback_ip)) {
-		cli_shutdown(&cli);
+	if (!cli_connect(cli, global_myname(), &loopback_ip)) {
+		cli_shutdown(cli);
 		return False;
 	}
 
-	cli_shutdown(&cli);
+	cli_shutdown(cli);
 	return True;
 }
diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index fb79f41f13..207614655d 100644
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -57,8 +57,8 @@ static int qsort_cmp_list(const void *x, const void *y) {
 	struct pri_list *a = (struct pri_list *)x;
 	struct pri_list *b = (struct pri_list *)y;
 	if (a->pri > b->pri) return -1;
-	if (a->pri == b->pri) return 0;
-	return 1;
+	if (a->pri < b->pri) return 1;
+	return 0;
 }
 
 /*
diff --git a/source3/web/swat.c b/source3/web/swat.c
index d1fd0b4f9b..d43f8941bc 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -432,7 +432,7 @@ static void write_config(FILE *f, BOOL show_defaults)
 {
 	fprintf(f, "# Samba config file created using SWAT\n");
 	fprintf(f, "# from %s (%s)\n", cgi_remote_host(), cgi_remote_addr());
-	fprintf(f, "# Date: %s\n\n", timestring(False));
+	fprintf(f, "# Date: %s\n\n", current_timestring(False));
 	
 	lp_dump(f, show_defaults, iNumNonAutoPrintServices);
 }
-- 
cgit 


From e0c68d0a1d591e4285746a8af70040448752a735 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Fri, 21 Jul 2006 14:13:30 +0000
Subject: r17177: Get rid of a global variable by adding a private data pointer
 to share_mode_forall().

Volker
(This used to be commit f97f6cedffdc4d10afcac90a163b93a801acf514)
---
 source3/web/statuspage.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index cb6fa91171..459b679d81 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -106,7 +106,10 @@ static char *tstring(time_t t)
 	return buf;
 }
 
-static void print_share_mode(const struct share_mode_entry *e, const char *sharepath, const char *fname)
+static void print_share_mode(const struct share_mode_entry *e,
+			     const char *sharepath,
+			     const char *fname,
+			     void *dummy)
 {
 	char           *utf8_fname;
 	int deny_mode;
@@ -434,7 +437,7 @@ void status_page(void)
 	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n", _("PID"), _("Sharing"), _("R/W"), _("Oplock"), _("File"), _("Date"));
 
 	locking_init(1);
-	share_mode_forall(print_share_mode);
+	share_mode_forall(print_share_mode, NULL);
 	locking_end();
 	printf("</table>\n");
 
-- 
cgit 


From 981588d57905674b1b13dc9830abf3e318d19ab3 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 28 Aug 2006 04:55:05 +0000
Subject: r17873: Fix possible null deref found by Stanford checker. Jeremy.
 (This used to be commit 1adb3b2432187e9a19b78cfa5762c3e05a357392)

---
 source3/web/cgi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index d289613b4b..046dd3bee6 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -80,8 +80,9 @@ static char *grab_line(FILE *f, int *cl)
 
 	}
 	
-
-	ret[i] = 0;
+	if (ret) {
+		ret[i] = 0;
+	}
 	return ret;
 }
 
-- 
cgit 


From 4952fe368a40b239140b3035db6075427d237bb9 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 5 Mar 2007 23:40:03 +0000
Subject: r21714: Change the VFS interface to use struct timespec for utimes -
 change the call to ntimes. This preserves nsec timestamps we get from stat
 (if the system supports it) and only maps back down to usec or sec resolution
 on time set. Looks bigger than it is as I had to move lots of internal code
 from using time_t and struct utimebuf to struct timespec. Jeremy. (This used
 to be commit 8f3d530c5a748ea90f42ed8fbe68ae92178d4875)

---
 source3/web/statuspage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 459b679d81..a88e5debd0 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -101,7 +101,7 @@ static char *mapPid2Machine (struct process_id pid)
 static char *tstring(time_t t)
 {
 	static pstring buf;
-	pstrcpy(buf, time_to_asc(&t));
+	pstrcpy(buf, time_to_asc(t));
 	all_string_sub(buf," ","&nbsp;",sizeof(buf));
 	return buf;
 }
-- 
cgit 


From 0d91334fe799f6b50a8265f9dc097411c3a29e18 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 11 Mar 2007 16:49:16 +0000
Subject: r21784: Replace smb_register_idle_event() with event_add_timed().
 This fixes winbind who did not run the idle events to drop ldap connections.

Volker
(This used to be commit af3308ce5a21220ff4c510de356dbaa6cf9ff997)
---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index d43f8941bc..e30c6d35f9 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1003,7 +1003,7 @@ static BOOL change_password(const char *remote_machine, const char *user_name,
 		return NT_STATUS_IS_OK(ret);
 	}
 
-	if(!initialize_password_db(True)) {
+	if(!initialize_password_db(True, NULL)) {
 		printf("%s\n<p>", _("Can't setup password database vectors."));
 		return False;
 	}
-- 
cgit 


From b1842fd29432220b99cbaf0ba1a3bc24994c3596 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 16 Apr 2007 20:06:02 +0000
Subject: r22282: Fix last few name -> servicename changes. Jeremy. (This used
 to be commit f5c22f26f7ec7e8139fbf11a75820336db3d55c0)

---
 source3/web/statuspage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index a88e5debd0..e4d726c4fd 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -230,7 +230,7 @@ static int traverse_fn3(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 		return 0;
 
 	printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n",
-	       crec.name,uidtoname(crec.uid),
+	       crec.servicename,uidtoname(crec.uid),
 	       gidtoname(crec.gid),procid_str_static(&crec.pid),
 	       crec.machine,
 	       tstring(crec.start));
-- 
cgit 


From e6383f47629368d9dd4e803f17566a24e9d7359e Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 7 May 2007 09:35:35 +0000
Subject: r22736: Start to merge the low-hanging fruit from the now 7000-line
 cluster patch.

This changes "struct process_id" to "struct server_id", keeping both is
just too much hassle. No functional change (I hope ;-))

Volker
(This used to be commit 0ad4b1226c9d91b72136310d3bbb640d2c5d67b8)
---
 source3/web/startstop.c  | 2 +-
 source3/web/statuspage.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 44945cd536..1485516474 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -121,7 +121,7 @@ void stop_winbindd(void)
 }
 #endif
 /* kill a specified process */
-void kill_pid(struct process_id pid)
+void kill_pid(struct server_id pid)
 {
 	if (geteuid() != 0) return;
 
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index e4d726c4fd..7b5c528a7d 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -28,14 +28,14 @@
 
 PIDMAP {
 	PIDMAP	*next, *prev;
-	struct process_id pid;
+	struct server_id pid;
 	char	*machine;
 };
 
 static PIDMAP	*pidmap;
 static int	PID_or_Machine;		/* 0 = show PID, else show Machine name */
 
-static struct process_id smbd_pid;
+static struct server_id smbd_pid;
 
 /* from 2nd call on, remove old list */
 static void initPid2Machine (void)
@@ -55,7 +55,7 @@ static void initPid2Machine (void)
 }
 
 /* add new PID <-> Machine name mapping */
-static void addPid2Machine (struct process_id pid, char *machine)
+static void addPid2Machine (struct server_id pid, char *machine)
 {
 	/* show machine name rather PID on table "Open Files"? */
 	if (PID_or_Machine) {
@@ -75,7 +75,7 @@ static void addPid2Machine (struct process_id pid, char *machine)
 }
 
 /* lookup PID <-> Machine name mapping */
-static char *mapPid2Machine (struct process_id pid)
+static char *mapPid2Machine (struct server_id pid)
 {
 	static char pidbuf [64];
 	PIDMAP *map;
-- 
cgit 


From 4aa44f7475e03dcc596f6a13fffffda7268074a1 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Tue, 8 May 2007 13:44:36 +0000
Subject: r22761: This introduces lib/conn_tdb.c with two main functions:
 connections_traverse and connections_forall. This centralizes all the
 routines that did individual tdb_open("connections.tdb") and direct
 tdb_traverse.

Volker
(This used to be commit e43e94cda1ad8876b3cb5d1129080b57fa6ec214)
---
 source3/web/statuspage.c | 83 ++++++++++++++++++------------------------------
 1 file changed, 31 insertions(+), 52 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 7b5c528a7d..2071561e2e 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -167,20 +167,17 @@ static void print_share_mode(const struct share_mode_entry *e,
 
 
 /* kill off any connections chosen by the user */
-static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* state)
+static int traverse_fn1(TDB_CONTEXT *tdb,
+			const struct connections_key *key,
+			const struct connections_data *crec,
+			void* state)
 {
-	struct connections_data crec;
-
-	if (dbuf.dsize != sizeof(crec))
-		return 0;
-
-	memcpy(&crec, dbuf.dptr, sizeof(crec));
-
-	if (crec.cnum == -1 && process_exists(crec.pid)) {
+	if (crec->cnum == -1 && process_exists(crec->pid)) {
 		char buf[30];
-		slprintf(buf,sizeof(buf)-1,"kill_%s", procid_str_static(&crec.pid));
+		slprintf(buf, sizeof(buf)-1,"kill_%s",
+			 procid_str_static(&crec->pid));
 		if (cgi_variable(buf)) {
-			kill_pid(crec.pid);
+			kill_pid(crec->pid);
 			sleep(SLEEP_TIME);
 		}
 	}
@@ -188,28 +185,24 @@ static int traverse_fn1(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 }
 
 /* traversal fn for showing machine connections */
-static int traverse_fn2(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* state)
+static int traverse_fn2(TDB_CONTEXT *tdb,
+			const struct connections_key *key,
+			const struct connections_data *crec,
+			void* state)
 {
-	struct connections_data crec;
-
-	if (dbuf.dsize != sizeof(crec))
-		return 0;
-
-	memcpy(&crec, dbuf.dptr, sizeof(crec));
-	
-	if (crec.cnum == -1 || !process_exists(crec.pid) ||
-	    procid_equal(&crec.pid, &smbd_pid))
+	if (crec->cnum == -1 || !process_exists(crec->pid) ||
+	    procid_equal(&crec->pid, &smbd_pid))
 		return 0;
 
-	addPid2Machine (crec.pid, crec.machine);
+	addPid2Machine (crec->pid, crec->machine);
 
 	printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td>\n",
-	       procid_str_static(&crec.pid),
-	       crec.machine,crec.addr,
-	       tstring(crec.start));
+	       procid_str_static(&crec->pid),
+	       crec->machine, crec->addr,
+	       tstring(crec->start));
 	if (geteuid() == 0) {
 		printf("<td><input type=submit value=\"X\" name=\"kill_%s\"></td>\n",
-		       procid_str_static(&crec.pid));
+		       procid_str_static(&crec->pid));
 	}
 	printf("</tr>\n");
 
@@ -217,23 +210,19 @@ static int traverse_fn2(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* st
 }
 
 /* traversal fn for showing share connections */
-static int traverse_fn3(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, void* state)
+static int traverse_fn3(TDB_CONTEXT *tdb,
+			const struct connections_key *key,
+			const struct connections_data *crec,
+			void* state)
 {
-	struct connections_data crec;
-
-	if (dbuf.dsize != sizeof(crec))
-		return 0;
-
-	memcpy(&crec, dbuf.dptr, sizeof(crec));
-
-	if (crec.cnum == -1 || !process_exists(crec.pid))
+	if (crec->cnum == -1 || !process_exists(crec->pid))
 		return 0;
 
 	printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n",
-	       crec.servicename,uidtoname(crec.uid),
-	       gidtoname(crec.gid),procid_str_static(&crec.pid),
-	       crec.machine,
-	       tstring(crec.start));
+	       crec->servicename, uidtoname(crec->uid),
+	       gidtoname(crec->gid),procid_str_static(&crec->pid),
+	       crec->machine,
+	       tstring(crec->start));
 	return 0;
 }
 
@@ -244,7 +233,6 @@ void status_page(void)
 	const char *v;
 	int autorefresh=0;
 	int refresh_interval=30;
-	TDB_CONTEXT *tdb;
 	int nr_running=0;
 	BOOL waitup = False;
 
@@ -322,8 +310,7 @@ void status_page(void)
 		PID_or_Machine = 0;
 	}
 
-	tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
-	if (tdb) tdb_traverse(tdb, traverse_fn1, NULL);
+	connections_forall(traverse_fn1, NULL);
  
 	initPid2Machine ();
 
@@ -344,12 +331,6 @@ void status_page(void)
 
 	printf("<p>\n");
 
-	if (!tdb) {
-		/* open failure either means no connections have been
-                   made */
-	}
-
-
 	printf("<table>\n");
 
 	printf("<tr><td>%s</td><td>%s</td></tr>", _("version:"), SAMBA_VERSION_STRING);
@@ -419,7 +400,7 @@ void status_page(void)
 	}
 	printf("</tr>\n");
 
-	if (tdb) tdb_traverse(tdb, traverse_fn2, NULL);
+	connections_forall(traverse_fn2, NULL);
 
 	printf("</table><p>\n");
 
@@ -428,7 +409,7 @@ void status_page(void)
 	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n\n",
 		_("Share"), _("User"), _("Group"), _("PID"), _("Client"), _("Date"));
 
-	if (tdb) tdb_traverse(tdb, traverse_fn3, NULL);
+	connections_forall(traverse_fn3, NULL);
 
 	printf("</table><p>\n");
 
@@ -441,8 +422,6 @@ void status_page(void)
 	locking_end();
 	printf("</table>\n");
 
-	if (tdb) tdb_close(tdb);
-
 	printf("<br><input type=submit name=\"show_client_in_col_1\" value=\"%s\">\n", _("Show Client in col 1"));
 	printf("<input type=submit name=\"show_pid_in_col_1\" value=\"%s\">\n", _("Show PID in col 1"));
 
-- 
cgit 


From 054bf2fc8bd8ac62e16ec04001c0a4a8409d0e1d Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 28 May 2007 11:38:42 +0000
Subject: r23171: Convert connections.tdb to dbwrap (This used to be commit
 80a1f43825063bbbda896175d99700ede5a4757a)

---
 source3/web/statuspage.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 2071561e2e..cd7b23d864 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -167,15 +167,14 @@ static void print_share_mode(const struct share_mode_entry *e,
 
 
 /* kill off any connections chosen by the user */
-static int traverse_fn1(TDB_CONTEXT *tdb,
+static int traverse_fn1(struct db_record *rec,
 			const struct connections_key *key,
 			const struct connections_data *crec,
-			void* state)
+			void *private_data)
 {
 	if (crec->cnum == -1 && process_exists(crec->pid)) {
 		char buf[30];
-		slprintf(buf, sizeof(buf)-1,"kill_%s",
-			 procid_str_static(&crec->pid));
+		slprintf(buf,sizeof(buf)-1,"kill_%s", procid_str_static(&crec->pid));
 		if (cgi_variable(buf)) {
 			kill_pid(crec->pid);
 			sleep(SLEEP_TIME);
@@ -185,10 +184,10 @@ static int traverse_fn1(TDB_CONTEXT *tdb,
 }
 
 /* traversal fn for showing machine connections */
-static int traverse_fn2(TDB_CONTEXT *tdb,
-			const struct connections_key *key,
-			const struct connections_data *crec,
-			void* state)
+static int traverse_fn2(struct db_record *rec,
+                        const struct connections_key *key,
+                        const struct connections_data *crec,
+                        void *private_data)
 {
 	if (crec->cnum == -1 || !process_exists(crec->pid) ||
 	    procid_equal(&crec->pid, &smbd_pid))
@@ -210,10 +209,10 @@ static int traverse_fn2(TDB_CONTEXT *tdb,
 }
 
 /* traversal fn for showing share connections */
-static int traverse_fn3(TDB_CONTEXT *tdb,
-			const struct connections_key *key,
-			const struct connections_data *crec,
-			void* state)
+static int traverse_fn3(struct db_record *rec,
+                        const struct connections_key *key,
+                        const struct connections_data *crec,
+                        void *private_data)
 {
 	if (crec->cnum == -1 || !process_exists(crec->pid))
 		return 0;
-- 
cgit 


From ce02d0dfcbeeeec316578322257d998589090c6f Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 20 Jun 2007 17:38:42 +0000
Subject: r23554: Fix bug #4711 by makeing cli_connect return an NTSTATUS. Long
 overdue fix.... Jeremy. (This used to be commit
 073fdc5a58139796dbaa7ea9833dca5308f11282)

---
 source3/web/diagnose.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index b53e139ca9..5f05d8ac9e 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -60,12 +60,14 @@ BOOL nmbd_running(void)
    then closing it */
 BOOL smbd_running(void)
 {
+	NTSTATUS status;
 	struct cli_state *cli;
 
 	if ((cli = cli_initialise()) == NULL)
 		return False;
 
-	if (!cli_connect(cli, global_myname(), &loopback_ip)) {
+	status = cli_connect(cli, global_myname(), &loopback_ip);
+	if (!NT_STATUS_IS_OK(status)) {
 		cli_shutdown(cli);
 		return False;
 	}
-- 
cgit 


From d824b98f80ba186030cbb70b3a1e5daf80469ecd Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 9 Jul 2007 19:25:36 +0000
Subject: r23779: Change from v2 or later to v3 or later. Jeremy. (This used to
 be commit 407e6e695b8366369b7c76af1ff76869b45347b3)

---
 source3/web/cgi.c        | 2 +-
 source3/web/diagnose.c   | 2 +-
 source3/web/neg_lang.c   | 2 +-
 source3/web/startstop.c  | 2 +-
 source3/web/statuspage.c | 2 +-
 source3/web/swat.c       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 046dd3bee6..a6adbda5d6 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -4,7 +4,7 @@
    
    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,
diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index 5f05d8ac9e..ae0103684e 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -5,7 +5,7 @@
    
    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,
diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index 207614655d..3142491051 100644
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -4,7 +4,7 @@
    
    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,
diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 1485516474..9306d7ba1f 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -5,7 +5,7 @@
    
    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,
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index cd7b23d864..0a909886ce 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -5,7 +5,7 @@
    
    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,
diff --git a/source3/web/swat.c b/source3/web/swat.c
index e30c6d35f9..a7ce307de7 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -7,7 +7,7 @@
    
    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,
-- 
cgit 


From 5e54558c6dea67b56bbfaba5698f3a434d3dffb6 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 00:52:41 +0000
Subject: r23784: use the GPLv3 boilerplate as recommended by the FSF and the
 license text (This used to be commit
 b0132e94fc5fef936aa766fb99a306b3628e9f07)

---
 source3/web/cgi.c        | 3 +--
 source3/web/diagnose.c   | 3 +--
 source3/web/neg_lang.c   | 3 +--
 source3/web/startstop.c  | 3 +--
 source3/web/statuspage.c | 3 +--
 source3/web/swat.c       | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index a6adbda5d6..9af4337a21 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -13,8 +13,7 @@
    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/>.
 */
 
 
diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index ae0103684e..227c68dd6d 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -14,8 +14,7 @@
    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"
diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index 3142491051..bb481306e7 100644
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -13,8 +13,7 @@
    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/>.
 
    Created by Ryo Kawahara <rkawa@lbe.co.jp> 
 */
diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 9306d7ba1f..63a9f298a5 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -14,8 +14,7 @@
    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"
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 0a909886ce..f4f84cd239 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -14,8 +14,7 @@
    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"
diff --git a/source3/web/swat.c b/source3/web/swat.c
index a7ce307de7..25dc9306ea 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -16,8 +16,7 @@
    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/>.
 */
 
 /**
-- 
cgit 


From 5b9ecb5ae3fbbe10260312608f1a175e683347fe Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 27 Aug 2007 11:41:05 +0000
Subject: r24701: Fix the swat build

Swat has not been built by default for a while, so I did not notice that
the _ macro is actually used. Re-add the lang_msg_rotate function, this
time only to swat so that this is the only binary that has to take the
16k penalty.
(This used to be commit 191e1ef840c293f8575cc0a3f3ffba2080431fae)
---
 source3/web/statuspage.c |  2 ++
 source3/web/swat.c       | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index f4f84cd239..e90a94d9e7 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -20,6 +20,8 @@
 #include "includes.h"
 #include "web/swat_proto.h"
 
+#define _(x) lang_msg_rotate(x)
+
 #define PIDMAP		struct PidMap
 
 /* how long to wait for start/stops to take effect */
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 25dc9306ea..d14e1bd1e9 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -51,6 +51,7 @@ static int iNumNonAutoPrintServices = 0;
 #define ENABLE_USER_FLAG "enable_user_flag"
 #define RHOST "remote_host"
 
+#define _(x) lang_msg_rotate(x)
 
 /****************************************************************************
 ****************************************************************************/
@@ -1328,6 +1329,30 @@ static void printers_page(void)
 	printf("</FORM>\n");
 }
 
+/*
+  when the _() translation macro is used there is no obvious place to free
+  the resulting string and there is no easy way to give a static pointer.
+  All we can do is rotate between some static buffers and hope a single d_printf()
+  doesn't have more calls to _() than the number of buffers
+*/
+
+const char *lang_msg_rotate(const char *msgid)
+{
+#define NUM_LANG_BUFS 16
+	char *msgstr;
+	static pstring bufs[NUM_LANG_BUFS];
+	static int next;
+
+	msgstr = (char *)lang_msg(msgid);
+	if (!msgstr) return msgid;
+
+	pstrcpy(bufs[next], msgstr);
+	msgstr = bufs[next];
+
+	next = (next+1) % NUM_LANG_BUFS;
+
+	return msgstr;
+}
 
 /**
  * main function for SWAT.
-- 
cgit 


From 24fc1d6dd5fce0fc02813d9bb68c12b7539de413 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 29 Aug 2007 13:52:07 +0000
Subject: r24781: Fix build warning.

Guenther
(This used to be commit 71307c371fea917b91214df7a24cd91170d40dd9)
---
 source3/web/statuspage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index e90a94d9e7..a03c7998ed 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -56,7 +56,7 @@ static void initPid2Machine (void)
 }
 
 /* add new PID <-> Machine name mapping */
-static void addPid2Machine (struct server_id pid, char *machine)
+static void addPid2Machine (struct server_id pid, const char *machine)
 {
 	/* show machine name rather PID on table "Open Files"? */
 	if (PID_or_Machine) {
-- 
cgit 


From 8e54530b52fd256137740107e9fdf000f00a7a30 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 10 Oct 2007 18:25:16 -0700
Subject: Add start of IPv6 implementation. Currently most of this is avoiding
 IPv6 in winbindd, but moves most of the socket functions that were wrongly in
 lib/util.c into lib/util_sock.c and provides generic IPv4/6 independent
 versions of most things. Still lots of work to do, but now I can see how I'll
 fix the access check code. Nasty part that remains is the name resolution
 code which is used to returning arrays of in_addr structs. Jeremy. (This used
 to be commit 3f6bd0e1ec5cc6670f3d08f76fc2cd94c9cd1a08)

---
 source3/web/diagnose.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index 227c68dd6d..9aba27c774 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -20,8 +20,6 @@
 #include "includes.h"
 #include "web/swat_proto.h"
 
-extern struct in_addr loopback_ip;
-
 #ifdef WITH_WINBIND
 
 /* check to see if winbind is running by pinging it */
@@ -36,9 +34,12 @@ BOOL winbindd_running(void)
    response */
 BOOL nmbd_running(void)
 {
+	struct in_addr loopback_ip;
 	int fd, count, flags;
 	struct in_addr *ip_list;
 
+	loopback_ip.s_addr = htonl(INADDR_LOOPBACK);
+
 	if ((fd = open_socket_in(SOCK_DGRAM, 0, 3,
 				 interpret_addr("127.0.0.1"), True)) != -1) {
 		if ((ip_list = name_query(fd, "__SAMBA__", 0, 
@@ -59,9 +60,12 @@ BOOL nmbd_running(void)
    then closing it */
 BOOL smbd_running(void)
 {
+	struct in_addr loopback_ip;
 	NTSTATUS status;
 	struct cli_state *cli;
 
+	loopback_ip.s_addr = htonl(INADDR_LOOPBACK);
+
 	if ((cli = cli_initialise()) == NULL)
 		return False;
 
-- 
cgit 


From cb5436bcc3b55e0c221fb6b3fa3133f149a64384 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 11 Oct 2007 15:36:13 -0700
Subject: Add const to the get_peer_addr() and get_socket_addr() calls. Use the
 IPv6 varient for get_peer_addr(). Jeremy. (This used to be commit
 baf1f52e34ae2465a7a34be1065da29ed97e7bea)

---
 source3/web/cgi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 9af4337a21..0e362ea245 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -633,7 +633,7 @@ 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_peer_name(1,False);
@@ -644,7 +644,7 @@ 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_peer_addr(1);
-- 
cgit 


From 30191d1a5704ad2b158386b511558972d539ce47 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 18 Oct 2007 17:40:25 -0700
Subject: RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in
 various places whilst doing this (places that assumed BOOL == int). I also
 need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to
 be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)

---
 source3/web/cgi.c        | 12 ++++++------
 source3/web/diagnose.c   |  6 +++---
 source3/web/statuspage.c |  2 +-
 source3/web/swat.c       | 30 +++++++++++++++---------------
 4 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 0e362ea245..6a8688b637 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -42,8 +42,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 bool inetd_server;
+static bool got_request;
 
 static char *grab_line(FILE *f, int *cl)
 {
@@ -328,7 +328,7 @@ static void cgi_web_auth(void)
 /***************************************************************************
 handle a http authentication line
   ***************************************************************************/
-static BOOL cgi_handle_authorization(char *line)
+static bool cgi_handle_authorization(char *line)
 {
 	char *p;
 	fstring user, user_pass;
@@ -399,7 +399,7 @@ err:
 /***************************************************************************
 is this root?
   ***************************************************************************/
-BOOL am_root(void)
+bool am_root(void)
 {
 	if (geteuid() == 0) {
 		return( True);
@@ -509,7 +509,7 @@ 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;
@@ -656,7 +656,7 @@ const 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;
diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index 9aba27c774..df3b34dd16 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -24,7 +24,7 @@
 
 /* check to see if winbind is running by pinging it */
 
-BOOL winbindd_running(void)
+bool winbindd_running(void)
 {
 	return winbind_ping();
 }	
@@ -32,7 +32,7 @@ BOOL winbindd_running(void)
 
 /* check to see if nmbd is running on localhost by looking for a __SAMBA__
    response */
-BOOL nmbd_running(void)
+bool nmbd_running(void)
 {
 	struct in_addr loopback_ip;
 	int fd, count, flags;
@@ -58,7 +58,7 @@ BOOL nmbd_running(void)
 
 /* check to see if smbd is running on localhost by trying to open a connection
    then closing it */
-BOOL smbd_running(void)
+bool smbd_running(void)
 {
 	struct in_addr loopback_ip;
 	NTSTATUS status;
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index a03c7998ed..b59c5cdf43 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -234,7 +234,7 @@ void status_page(void)
 	int autorefresh=0;
 	int refresh_interval=30;
 	int nr_running=0;
-	BOOL waitup = False;
+	bool waitup = False;
 
 	smbd_pid = pid_to_procid(pidfile_pid("smbd"));
 
diff --git a/source3/web/swat.c b/source3/web/swat.c
index d14e1bd1e9..cf90ec0792 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -30,10 +30,10 @@
 #include "includes.h"
 #include "web/swat_proto.h"
 
-static BOOL demo_mode = False;
-static BOOL passwd_only = False;
-static BOOL have_write_access = False;
-static BOOL have_read_access = False;
+static bool demo_mode = False;
+static bool passwd_only = False;
+static bool have_write_access = False;
+static bool have_read_access = False;
 static int iNumNonAutoPrintServices = 0;
 
 /*
@@ -287,20 +287,20 @@ static void show_parameter(int snum, struct parm_struct *parm)
 
 	case P_BOOL:
 		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
-		printf("<option %s>Yes", (*(BOOL *)ptr)?"selected":"");
-		printf("<option %s>No", (*(BOOL *)ptr)?"":"selected");
+		printf("<option %s>Yes", (*(bool *)ptr)?"selected":"");
+		printf("<option %s>No", (*(bool *)ptr)?"":"selected");
 		printf("</select>");
 		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
-			_("Set Default"), make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?0:1);
+			_("Set Default"), make_parm_name(parm->label),(bool)(parm->def.bvalue)?0:1);
 		break;
 
 	case P_BOOLREV:
 		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
-		printf("<option %s>Yes", (*(BOOL *)ptr)?"":"selected");
-		printf("<option %s>No", (*(BOOL *)ptr)?"selected":"");
+		printf("<option %s>Yes", (*(bool *)ptr)?"":"selected");
+		printf("<option %s>No", (*(bool *)ptr)?"selected":"");
 		printf("</select>");
 		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.selectedIndex=\'%d\'\">",
-			_("Set Default"), make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?1:0);
+			_("Set Default"), make_parm_name(parm->label),(bool)(parm->def.bvalue)?1:0);
 		break;
 
 	case P_INTEGER:
@@ -385,7 +385,7 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
 
 				case P_BOOL:
 				case P_BOOLREV:
-					if (*(BOOL *)ptr == (BOOL)(parm->def.bvalue)) continue;
+					if (*(bool *)ptr == (bool)(parm->def.bvalue)) continue;
 					break;
 
 				case P_INTEGER:
@@ -419,7 +419,7 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
 /****************************************************************************
   load the smb.conf file into loadparm.
 ****************************************************************************/
-static BOOL load_config(BOOL save_def)
+static bool load_config(bool save_def)
 {
 	lp_resetnumservices();
 	return lp_load(dyn_CONFIGFILE,False,save_def,False,True);
@@ -428,7 +428,7 @@ static BOOL load_config(BOOL save_def)
 /****************************************************************************
   write a config file 
 ****************************************************************************/
-static void write_config(FILE *f, BOOL show_defaults)
+static void write_config(FILE *f, bool show_defaults)
 {
 	fprintf(f, "# Samba config file created using SWAT\n");
 	fprintf(f, "# from %s (%s)\n", cgi_remote_host(), cgi_remote_addr());
@@ -982,7 +982,7 @@ static void shares_page(void)
 /*************************************************************
 change a password either locally or remotely
 *************************************************************/
-static BOOL change_password(const char *remote_machine, const char *user_name, 
+static bool change_password(const char *remote_machine, const char *user_name, 
 			    const char *old_passwd, const char *new_passwd, 
 				int local_flags)
 {
@@ -1025,7 +1025,7 @@ static BOOL change_password(const char *remote_machine, const char *user_name,
 static void chg_passwd(void)
 {
 	const char *host;
-	BOOL rslt;
+	bool rslt;
 	int local_flags = 0;
 
 	/* Make sure users name has been specified */
-- 
cgit 


From 9a85533914119fb995fb61555c9f6e0018d4d181 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 19 Oct 2007 11:38:36 -0700
Subject: Fix the popt / bool issues. Some places we used BOOL where we meant
 int. Fix this. Thanks to metze for pointing this out. Jeremy. (This used to
 be commit 793a9d24a163cb6cf5a3a0aa5ae30e9f8cf4744a)

---
 source3/web/swat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index cf90ec0792..7d74fa9d71 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -30,8 +30,8 @@
 #include "includes.h"
 #include "web/swat_proto.h"
 
-static bool demo_mode = False;
-static bool passwd_only = False;
+static int demo_mode = False;
+static int passwd_only = False;
 static bool have_write_access = False;
 static bool have_read_access = False;
 static int iNumNonAutoPrintServices = 0;
-- 
cgit 


From f88b7a076be74a29a3bf876b4e2705f4a1ecf42b Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 24 Oct 2007 14:16:54 -0700
Subject: This is a large patch (sorry). Migrate from struct in_addr to struct
 sockaddr_storage in most places that matter (ie. not the nmbd and NetBIOS
 lookups). This passes make test on an IPv4 box, but I'll have to do more
 work/testing on IPv6 enabled boxes. This should now give us a framework for
 testing and finishing the IPv6 migration. It's at the state where someone
 with a working IPv6 setup should (theorecically) be able to type : smbclient
 //ipv6-address/share and have it work. Jeremy. (This used to be commit
 98e154c3125d5732c37a72d74b0eb5cd7b6155fd)

---
 source3/web/diagnose.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index df3b34dd16..221ce83f82 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -36,16 +36,18 @@ bool nmbd_running(void)
 {
 	struct in_addr loopback_ip;
 	int fd, count, flags;
-	struct in_addr *ip_list;
+	struct sockaddr_storage *ss_list;
+	struct sockaddr_storage ss;
 
 	loopback_ip.s_addr = htonl(INADDR_LOOPBACK);
+	in_addr_to_sockaddr_storage(&ss, loopback_ip);
 
 	if ((fd = open_socket_in(SOCK_DGRAM, 0, 3,
-				 interpret_addr("127.0.0.1"), True)) != -1) {
-		if ((ip_list = name_query(fd, "__SAMBA__", 0, 
-					  True, True, loopback_ip,
+				 &ss, True)) != -1) {
+		if ((ss_list = name_query(fd, "__SAMBA__", 0, 
+					  True, True, &ss,
 					  &count, &flags, NULL)) != NULL) {
-			SAFE_FREE(ip_list);
+			SAFE_FREE(ss_list);
 			close(fd);
 			return True;
 		}
@@ -63,13 +65,15 @@ bool smbd_running(void)
 	struct in_addr loopback_ip;
 	NTSTATUS status;
 	struct cli_state *cli;
+	struct sockaddr_storage ss;
 
 	loopback_ip.s_addr = htonl(INADDR_LOOPBACK);
+	in_addr_to_sockaddr_storage(&ss, loopback_ip);
 
 	if ((cli = cli_initialise()) == NULL)
 		return False;
 
-	status = cli_connect(cli, global_myname(), &loopback_ip);
+	status = cli_connect(cli, global_myname(), &ss);
 	if (!NT_STATUS_IS_OK(status)) {
 		cli_shutdown(cli);
 		return False;
-- 
cgit 


From 6658165d5e9cd186fea74e1581091233e8990e9b Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 3 Nov 2007 18:15:45 -0700
Subject: Stop get_peer_addr() and client_addr() from using global statics.
 Part of my library cleanups. Jeremy. (This used to be commit
 e848506c858bd16706c1d7f6b4b032005512b8ac)

---
 source3/web/cgi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 6a8688b637..71328459f0 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -647,7 +647,8 @@ return the hostname of the client
 const char *cgi_remote_addr(void)
 {
 	if (inetd_server) {
-		return get_peer_addr(1);
+		char addr[INET6_ADDRSTRLEN];
+		return get_peer_addr(1,addr);
 	}
 	return getenv("REMOTE_ADDR");
 }
-- 
cgit 


From 25074433f412c4dd2531fd268d51be8753ddc11b Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Sat, 3 Nov 2007 18:41:26 -0700
Subject: I can't get away without a 'length' arg. :-). Jeremy. (This used to
 be commit 95d01279a5def709d0a5d5ae7224d6286006d120)

---
 source3/web/cgi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 71328459f0..41ac29be5d 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -648,7 +648,7 @@ const char *cgi_remote_addr(void)
 {
 	if (inetd_server) {
 		char addr[INET6_ADDRSTRLEN];
-		return get_peer_addr(1,addr);
+		return get_peer_addr(1,addr,sizeof(addr));
 	}
 	return getenv("REMOTE_ADDR");
 }
-- 
cgit 


From 68be9a820059ee96dd26c527efd7c14e679d3f2c Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 15 Nov 2007 14:19:52 -0800
Subject: More pstring removal. This one was tricky. I had to add one horror
 (pstring_clean_name()) which will have to remain until I've removed all
 pstrings from the client code. Jeremy. (This used to be commit
 1ea3ac80146b83c2522b69e7747c823366a2b47d)

---
 source3/web/swat.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 7d74fa9d71..e9ed0ded54 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1368,6 +1368,7 @@ const char *lang_msg_rotate(const char *msgid)
 		POPT_COMMON_SAMBA
 		POPT_TABLEEND
 	};
+	TALLOC_CTX *frame = talloc_stackframe();
 
 	fault_setup(NULL);
 	umask(S_IWGRP | S_IWOTH);
@@ -1454,6 +1455,8 @@ const char *lang_msg_rotate(const char *msgid)
 	}
 
 	print_footer();
+
+	TALLOC_FREE(frame);
 	return 0;
 }
 
-- 
cgit 


From 7ef6c19074495110d5c0b698b05c4ee52a0744d6 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 21 Nov 2007 17:42:52 -0800
Subject: Remove pstrings from pam_smbpass - make local_password_change return
 malloced strings. Jeremy. (This used to be commit
 f652fe2bdb7a3a36e83dcf4b08347543fdffb9f0)

---
 source3/web/swat.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index e9ed0ded54..95921c0b1d 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -987,8 +987,8 @@ static bool change_password(const char *remote_machine, const char *user_name,
 				int local_flags)
 {
 	NTSTATUS ret;
-	pstring err_str;
-	pstring msg_str;
+	char *err_str = NULL;
+	char *msg_str = NULL;
 
 	if (demo_mode) {
 		printf("%s\n<p>", _("password change in demo mode rejected"));
@@ -1008,14 +1008,16 @@ static bool change_password(const char *remote_machine, const char *user_name,
 		return False;
 	}
 	
-	ret = local_password_change(user_name, local_flags, new_passwd, err_str, sizeof(err_str),
-					 msg_str, sizeof(msg_str));
+	ret = local_password_change(user_name, local_flags, new_passwd,
+					&err_str, &msg_str);
 
-	if(*msg_str)
+	if(msg_str)
 		printf("%s\n<p>", msg_str);
-	if(*err_str)
+	if(err_str)
 		printf("%s\n<p>", err_str);
 
+	SAFE_FREE(msg_str);
+	SAFE_FREE(err_str);
 	return NT_STATUS_IS_OK(ret);
 }
 
-- 
cgit 


From d2c2635a280b1bfbbcd52fa96bbeff3f60672c45 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@sernet.de>
Date: Fri, 23 Nov 2007 12:04:35 +0100
Subject: Make remote_password_change return malloced error strings

This fixes a segfault in smbpasswd -r
(This used to be commit 49949f0b85007c7c2b3c340c12f3d18909862135)
---
 source3/web/swat.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 95921c0b1d..65f8877bb3 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -996,10 +996,11 @@ static bool change_password(const char *remote_machine, const char *user_name,
 	}
 	
 	if (remote_machine != NULL) {
-		ret = remote_password_change(remote_machine, user_name, old_passwd, 
-									 new_passwd, err_str, sizeof(err_str));
-		if(*err_str)
+		ret = remote_password_change(remote_machine, user_name,
+					     old_passwd, new_passwd, &err_str);
+		if (err_str != NULL)
 			printf("%s\n<p>", err_str);
+		SAFE_FREE(err_str);
 		return NT_STATUS_IS_OK(ret);
 	}
 
-- 
cgit 


From 6f46f75dfc2c80b99a6a5fb277bab456a5fd247b Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 3 Dec 2007 17:17:05 -0800
Subject: Make strhex_to_str clear on string limits. Remove pstring from
 web/*.c Jeremy. (This used to be commit
 f9c8d62389f8cb47837e5360209936176537df13)

---
 source3/web/cgi.c        | 36 ++++++++++--------
 source3/web/startstop.c  | 48 +++++++++++------------
 source3/web/statuspage.c | 29 +++++++++-----
 source3/web/swat.c       | 99 +++++++++++++++++++++++++++++-------------------
 4 files changed, 123 insertions(+), 89 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 41ac29be5d..07a6fbcf54 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -173,7 +173,7 @@ void cgi_load_variables(void)
 			variables[num_variables].name = SMB_STRDUP(tok);
 			variables[num_variables].value = SMB_STRDUP(p+1);
 
-			if (!variables[num_variables].name || 
+			if (!variables[num_variables].name ||
 			    !variables[num_variables].value)
 				continue;
 
@@ -186,32 +186,36 @@ void cgi_load_variables(void)
                         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 UTF-8 - convert them
 	   to our internal unix charset before use */
 	for (i=0;i<num_variables;i++) {
-		pstring dest;
-
-		convert_string(CH_UTF8, CH_UNIX, 
-			       variables[i].name, -1, 
-			       dest, sizeof(dest), True);
-		free(variables[i].name);
-		variables[i].name = SMB_STRDUP(dest);
-
-		convert_string(CH_UTF8, CH_UNIX, 
+		TALLOC_CTX *frame = talloc_stackframe();
+		char *dest;
+
+		dest = NULL;
+		convert_string_allocate(frame, CH_UTF8, CH_UNIX,
+			       variables[i].name, -1,
+			       &dest, True);
+		SAFE_FREE(variables[i].name);
+		variables[i].name = SMB_STRDUP(dest ? dest : "");
+
+		dest = NULL;
+		convert_string_allocate(frame, CH_UTF8, CH_UNIX,
 			       variables[i].value, -1,
-			       dest, sizeof(dest), True);
-		free(variables[i].value);
-		variables[i].value = SMB_STRDUP(dest);
+			       &dest, True);
+		SAFE_FREE(variables[i].value);
+		variables[i].value = SMB_STRDUP(dest ? dest : "");
+		TALLOC_FREE(frame);
 	}
 }
 
@@ -219,7 +223,7 @@ 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.
   ***************************************************************************/
diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 63a9f298a5..436666f849 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -25,60 +25,60 @@
 /** Startup smbd from web interface. */
 void start_smbd(void)
 {
-	pstring binfile;
+	char *binfile = NULL;
 
-	if (geteuid() != 0) return;
+	if (geteuid() != 0) {
+		 return;
+	}
 
 	if (fork()) {
 		return;
 	}
 
-	slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", dyn_SBINDIR);
-
-	become_daemon(True, False);
-
-	execl(binfile, binfile, "-D", NULL);
-
+	if (asprintf(&binfile, "%s/smbd", dyn_SBINDIR) > 0) {
+		become_daemon(true, false);
+		execl(binfile, binfile, "-D", NULL);
+	}
 	exit(0);
 }
 
 /* startup nmbd */
 void start_nmbd(void)
 {
-	pstring binfile;
+	char *binfile = NULL;
 
-	if (geteuid() != 0) return;
+	if (geteuid() != 0) {
+		return;
+	}
 
 	if (fork()) {
 		return;
 	}
 
-	slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", dyn_SBINDIR);
-	
-	become_daemon(True, False);
-
-	execl(binfile, binfile, "-D", NULL);
-
+	if (asprintf(&binfile, "%s/nmbd", dyn_SBINDIR) > 0) {
+		become_daemon(true, false);
+		execl(binfile, binfile, "-D", NULL);
+	}
 	exit(0);
 }
 
 /** Startup winbindd from web interface. */
 void start_winbindd(void)
 {
-	pstring binfile;
+	char *binfile = NULL;
 
-	if (geteuid() != 0) return;
+	if (geteuid() != 0) {
+		return;
+	}
 
 	if (fork()) {
 		return;
 	}
 
-	slprintf(binfile, sizeof(pstring) - 1, "%s/winbindd", dyn_SBINDIR);
-
-	become_daemon(True, False);
-
-	execl(binfile, binfile, NULL);
-
+	if (asprintf(&binfile, "%s/winbindd", dyn_SBINDIR) > 0) {
+		become_daemon(true, false);
+		execl(binfile, binfile, NULL);
+	}
 	exit(0);
 }
 
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index b59c5cdf43..647e4fcb5b 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "web/swat_proto.h"
 
-#define _(x) lang_msg_rotate(x)
+#define _(x) lang_msg_rotate(talloc_tos(),x)
 
 #define PIDMAP		struct PidMap
 
@@ -99,11 +99,20 @@ static char *mapPid2Machine (struct server_id pid)
 	return pidbuf;
 }
 
-static char *tstring(time_t t)
+static const char *tstring(TALLOC_CTX *ctx, time_t t)
 {
-	static pstring buf;
-	pstrcpy(buf, time_to_asc(t));
-	all_string_sub(buf," ","&nbsp;",sizeof(buf));
+	char *buf;
+	buf = talloc_strdup(ctx, time_to_asc(t));
+	if (!buf) {
+		return "";
+	}
+	buf = talloc_all_string_sub(ctx,
+			buf,
+			" ",
+			"&nbsp;");
+	if (!buf) {
+		return "";
+	}
 	return buf;
 }
 
@@ -162,7 +171,7 @@ static void print_share_mode(const struct share_mode_entry *e,
 
 	push_utf8_allocate(&utf8_fname, fname);
 	printf("<td>%s</td><td>%s</td></tr>\n",
-	       utf8_fname,tstring(e->time.tv_sec));
+	       utf8_fname,tstring(talloc_tos(),e->time.tv_sec));
 	SAFE_FREE(utf8_fname);
 }
 
@@ -199,7 +208,7 @@ static int traverse_fn2(struct db_record *rec,
 	printf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td>\n",
 	       procid_str_static(&crec->pid),
 	       crec->machine, crec->addr,
-	       tstring(crec->start));
+	       tstring(talloc_tos(),crec->start));
 	if (geteuid() == 0) {
 		printf("<td><input type=submit value=\"X\" name=\"kill_%s\"></td>\n",
 		       procid_str_static(&crec->pid));
@@ -222,7 +231,7 @@ static int traverse_fn3(struct db_record *rec,
 	       crec->servicename, uidtoname(crec->uid),
 	       gidtoname(crec->gid),procid_str_static(&crec->pid),
 	       crec->machine,
-	       tstring(crec->start));
+	       tstring(talloc_tos(),crec->start));
 	return 0;
 }
 
@@ -235,6 +244,7 @@ void status_page(void)
 	int refresh_interval=30;
 	int nr_running=0;
 	bool waitup = False;
+	TALLOC_CTX *ctx = talloc_stackframe();
 
 	smbd_pid = pid_to_procid(pidfile_pid("smbd"));
 
@@ -311,7 +321,7 @@ void status_page(void)
 	}
 
 	connections_forall(traverse_fn1, NULL);
- 
+
 	initPid2Machine ();
 
 	printf("<H2>%s</H2>\n", _("Server Status"));
@@ -438,4 +448,5 @@ void status_page(void)
 		       refresh_interval*1000);
 		printf("//-->\n</script>\n");
 	}
+	TALLOC_FREE(ctx);
 }
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 65f8877bb3..b36168f71f 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -51,7 +51,7 @@ static int iNumNonAutoPrintServices = 0;
 #define ENABLE_USER_FLAG "enable_user_flag"
 #define RHOST "remote_host"
 
-#define _(x) lang_msg_rotate(x)
+#define _(x) lang_msg_rotate(talloc_tos(),x)
 
 /****************************************************************************
 ****************************************************************************/
@@ -77,16 +77,30 @@ static char *fix_backslash(const char *str)
 	return newstring;
 }
 
-static char *fix_quotes(const char *str)
+static const char *fix_quotes(TALLOC_CTX *ctx, const char *str)
 {
-	static pstring newstring;
-	char *p = newstring;
-	size_t newstring_len = sizeof(newstring);
+	char *newstring = NULL;
+	char *p = NULL;
+	size_t newstring_len;
 	int quote_len = strlen("&quot;");
 
+	/* Count the number of quotes. */
+	newstring_len = 1;
 	while (*str) {
-		if ( *str == '\"' && (newstring_len - PTR_DIFF(p, newstring) - 1) > quote_len ) {
-			strncpy( p, "&quot;", quote_len); 
+		if ( *str == '\"') {
+			newstring_len += quote_len;
+		} else {
+			newstring_len++;
+		}
+		++str;
+	}
+	newstring = TALLOC_ARRAY(ctx, char, newstring_len);
+	if (!newstring) {
+		return "";
+	}
+	for (p = newstring; *str; str++) {
+		if ( *str == '\"') {
+			strncpy( p, "&quot;", quote_len);
 			p += quote_len;
 		} else {
 			*p++ = *str;
@@ -180,25 +194,24 @@ static void print_header(void)
    "i18n_translated_parm" class is used to change the color of the
    translated parameter with CSS.
    **************************************************************** */
-static const char* get_parm_translated(
+static const char *get_parm_translated(TALLOC_CTX *ctx,
 	const char* pAnchor, const char* pHelp, const char* pLabel)
 {
-	const char* pTranslated = _(pLabel);
-	static pstring output;
-	if(strcmp(pLabel, pTranslated) != 0)
-	{
-		pstr_sprintf(output,
+	const char *pTranslated = _(pLabel);
+	char *output;
+	if(strcmp(pLabel, pTranslated) != 0) {
+		output = talloc_asprintf(ctx,
 		  "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s <br><span class=\"i18n_translated_parm\">%s</span>",
 		   pAnchor, pHelp, pLabel, pTranslated);
 		return output;
 	}
-	pstr_sprintf(output, 
+	output = talloc_asprintf(ctx,
 	  "<A HREF=\"/swat/help/manpages/smb.conf.5.html#%s\" target=\"docs\"> %s</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s",
 	  pAnchor, pHelp, pLabel);
 	return output;
 }
 /****************************************************************************
- finish off the page 
+ finish off the page
 ****************************************************************************/
 static void print_footer(void)
 {
@@ -208,19 +221,21 @@ static void print_footer(void)
 }
 
 /****************************************************************************
-  display one editable parameter in a form 
+  display one editable parameter in a form
 ****************************************************************************/
 static void show_parameter(int snum, struct parm_struct *parm)
 {
 	int i;
 	void *ptr = parm->ptr;
 	char *utf8_s1, *utf8_s2;
+	TALLOC_CTX *ctx = talloc_stackframe();
 
 	if (parm->p_class == P_LOCAL && snum >= 0) {
 		ptr = lp_local_ptr(snum, ptr);
 	}
 
-	printf("<tr><td>%s</td><td>", get_parm_translated(stripspaceupper(parm->label), _("Help"), parm->label));
+	printf("<tr><td>%s</td><td>", get_parm_translated(ctx,
+				stripspaceupper(parm->label), _("Help"), parm->label));
 	switch (parm->type) {
 	case P_CHAR:
 		printf("<input type=text size=2 name=\"parm_%s\" value=\"%c\">",
@@ -256,7 +271,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 			char **list = (char **)(parm->def.lvalue);
 			for (; *list; list++) {
 				/* enclose in HTML encoded quotes if the string contains a space */
-				if ( strchr_m(*list, ' ') ) 
+				if ( strchr_m(*list, ' ') )
 					printf("&quot;%s&quot;%s", *list, ((*(list+1))?", ":""));
 				else
 					printf("%s%s", *list, ((*(list+1))?", ":""));
@@ -269,7 +284,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 	case P_USTRING:
 		push_utf8_allocate(&utf8_s1, *(char **)ptr);
 		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
-		       make_parm_name(parm->label), fix_quotes(utf8_s1));
+		       make_parm_name(parm->label), fix_quotes(ctx, utf8_s1));
 		SAFE_FREE(utf8_s1);
 		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
 			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
@@ -279,7 +294,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 	case P_UGSTRING:
 		push_utf8_allocate(&utf8_s1, (char *)ptr);
 		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
-		       make_parm_name(parm->label), fix_quotes(utf8_s1));
+		       make_parm_name(parm->label), fix_quotes(ctx, utf8_s1));
 		SAFE_FREE(utf8_s1);
 		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
 			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
@@ -331,6 +346,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 		break;
 	}
 	printf("</td></tr>\n");
+	TALLOC_FREE(ctx);
 }
 
 /****************************************************************************
@@ -510,14 +526,17 @@ static void commit_parameters(int snum)
 {
 	int i = 0;
 	struct parm_struct *parm;
-	pstring label;
+	char *label;
 	const char *v;
 
 	while ((parm = lp_next_parameter(snum, &i, 1))) {
-		slprintf(label, sizeof(label)-1, "parm_%s", make_parm_name(parm->label));
-		if ((v = cgi_variable(label)) != NULL) {
-			if (parm->flags & FLAG_HIDE) continue;
-			commit_parameter(snum, parm, v); 
+		if (asprintf(&label, "parm_%s", make_parm_name(parm->label)) > 0) {
+			if ((v = cgi_variable(label)) != NULL) {
+				if (parm->flags & FLAG_HIDE)
+					continue;
+				commit_parameter(snum, parm, v);
+			}
+			SAFE_FREE(label);
 		}
 	}
 }
@@ -720,9 +739,8 @@ static void wizard_page(void)
 
 		/* Have to create Homes share? */
 		if ((HomeExpo == 1) && (have_home == -1)) {
-			pstring unix_share;
-			
-			pstrcpy(unix_share,HOMES_NAME);
+			const char *unix_share = HOMES_NAME;
+
 			load_config(False);
 			lp_copy_service(GLOBAL_SECTION_SNUM, unix_share);
 			iNumNonAutoPrintServices = lp_numservices();
@@ -749,7 +767,6 @@ static void wizard_page(void)
 			winstype = 1;
 		if (lp_wins_server_list() && strlen(*lp_wins_server_list()))
  		        winstype = 2;
- 		
 
 		/* Do we have a homes share? */
 		have_home = lp_servicenumber(HOMES_NAME);
@@ -1339,22 +1356,24 @@ static void printers_page(void)
   doesn't have more calls to _() than the number of buffers
 */
 
-const char *lang_msg_rotate(const char *msgid)
+const char *lang_msg_rotate(TALLOC_CTX *ctx, const char *msgid)
 {
-#define NUM_LANG_BUFS 16
-	char *msgstr;
-	static pstring bufs[NUM_LANG_BUFS];
-	static int next;
+	const char *msgstr;
+	const char *ret;
 
-	msgstr = (char *)lang_msg(msgid);
-	if (!msgstr) return msgid;
+	msgstr = lang_msg(msgid);
+	if (!msgstr) {
+		return msgid;
+	}
 
-	pstrcpy(bufs[next], msgstr);
-	msgstr = bufs[next];
+	ret = talloc_strdup(ctx, msgstr);
 
-	next = (next+1) % NUM_LANG_BUFS;
+	lang_msg_free(msgstr);
+	if (!ret) {
+		return msgid;
+	}
 
-	return msgstr;
+	return ret;
 }
 
 /**
-- 
cgit 


From 78c6ee0090f4122bc25baaacb5546517ad4b7bc6 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@sernet.de>
Date: Sat, 24 Nov 2007 17:27:54 +0100
Subject: Remove some globals (This used to be commit
 31d0a846db08d845e6cdfd85def4ac1c34031e02)

---
 source3/web/swat.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index b36168f71f..75a7f1939a 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -324,12 +324,19 @@ static void show_parameter(int snum, struct parm_struct *parm)
 			_("Set Default"), make_parm_name(parm->label),(int)(parm->def.ivalue));
 		break;
 
-	case P_OCTAL:
-		printf("<input type=text size=8 name=\"parm_%s\" value=%s>", make_parm_name(parm->label), octal_string(*(int *)ptr));
-		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
-		       _("Set Default"), make_parm_name(parm->label),
-		       octal_string((int)(parm->def.ivalue)));
+	case P_OCTAL: {
+		char *o;
+		o = octal_string(*(int *)ptr);
+		printf("<input type=text size=8 name=\"parm_%s\" value=%s>",
+		       make_parm_name(parm->label), o);
+		TALLOC_FREE(o);
+		o = octal_string((int)(parm->def.ivalue));
+		printf("<input type=button value=\"%s\" "
+		       "onClick=\"swatform.parm_%s.value=\'%s\'\">",
+		       _("Set Default"), make_parm_name(parm->label), o);
+		TALLOC_FREE(o);
 		break;
+	}
 
 	case P_ENUM:
 		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
-- 
cgit 


From ade51769d5f7291f912893e5f959b651223a68c1 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 7 Dec 2007 12:43:10 -0800
Subject: We don't need P_GSTRING or P_UGSTRING anymore. Jeremy. (This used to
 be commit 78dc75600099b5b3b5a8ecffec747a227ff51d70)

---
 source3/web/swat.c | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 75a7f1939a..3440010f43 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -290,16 +290,6 @@ static void show_parameter(int snum, struct parm_struct *parm)
 			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
 		break;
 
-	case P_GSTRING:
-	case P_UGSTRING:
-		push_utf8_allocate(&utf8_s1, (char *)ptr);
-		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
-		       make_parm_name(parm->label), fix_quotes(ctx, utf8_s1));
-		SAFE_FREE(utf8_s1);
-		printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
-			_("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
-		break;
-
 	case P_BOOL:
 		printf("<select name=\"parm_%s\">",make_parm_name(parm->label)); 
 		printf("<option %s>Yes", (*(bool *)ptr)?"selected":"");
@@ -401,11 +391,6 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
 					if (!strcmp(*(char **)ptr,(char *)(parm->def.svalue))) continue;
 					break;
 
-				case P_GSTRING:
-				case P_UGSTRING:
-					if (!strcmp((char *)ptr,(char *)(parm->def.svalue))) continue;
-					break;
-
 				case P_BOOL:
 				case P_BOOLREV:
 					if (*(bool *)ptr == (bool)(parm->def.bvalue)) continue;
-- 
cgit 


From d60fac2a5a789680b6dd9f05ab15a3033ec2887c Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@sernet.de>
Date: Wed, 5 Dec 2007 20:53:22 +0100
Subject: Tiny simplifications

locking.c:open_read_only was unused

don't export the silly boolean flag locking_init(bool read_only)
(This used to be commit 2f3c865707010bc7c463a02782dbee3dc2479da1)
---
 source3/web/statuspage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 647e4fcb5b..eda53b66ab 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -427,7 +427,7 @@ void status_page(void)
 	printf("<table border=1>\n");
 	printf("<tr><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th><th>%s</th></tr>\n", _("PID"), _("Sharing"), _("R/W"), _("Oplock"), _("File"), _("Date"));
 
-	locking_init(1);
+	locking_init_readonly();
 	share_mode_forall(print_share_mode, NULL);
 	locking_end();
 	printf("</table>\n");
-- 
cgit 


From 7faee02d0d351c5c039e8f1be7e82ce3a93cbe96 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 10 Dec 2007 11:30:37 -0800
Subject: Remove the char[1024] strings from dynconfig. Replace them with
 malloc'ing accessor functions. Should save a lot of static space :-). Jeremy.
 (This used to be commit 52dc5eaef2106015b3a8b659e818bdb15ad94b05)

---
 source3/web/startstop.c |  6 +++---
 source3/web/swat.c      | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 436666f849..b24410a89f 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -35,7 +35,7 @@ void start_smbd(void)
 		return;
 	}
 
-	if (asprintf(&binfile, "%s/smbd", dyn_SBINDIR) > 0) {
+	if (asprintf(&binfile, "%s/smbd", get_dyn_SBINDIR()) > 0) {
 		become_daemon(true, false);
 		execl(binfile, binfile, "-D", NULL);
 	}
@@ -55,7 +55,7 @@ void start_nmbd(void)
 		return;
 	}
 
-	if (asprintf(&binfile, "%s/nmbd", dyn_SBINDIR) > 0) {
+	if (asprintf(&binfile, "%s/nmbd", get_dyn_SBINDIR()) > 0) {
 		become_daemon(true, false);
 		execl(binfile, binfile, "-D", NULL);
 	}
@@ -75,7 +75,7 @@ void start_winbindd(void)
 		return;
 	}
 
-	if (asprintf(&binfile, "%s/winbindd", dyn_SBINDIR) > 0) {
+	if (asprintf(&binfile, "%s/winbindd", get_dyn_SBINDIR()) > 0) {
 		become_daemon(true, false);
 		execl(binfile, binfile, NULL);
 	}
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 3440010f43..2cf0eabeed 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -430,7 +430,7 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
 static bool load_config(bool save_def)
 {
 	lp_resetnumservices();
-	return lp_load(dyn_CONFIGFILE,False,save_def,False,True);
+	return lp_load(get_dyn_CONFIGFILE(),False,save_def,False,True);
 }
 
 /****************************************************************************
@@ -453,9 +453,9 @@ static int save_reload(int snum)
 	FILE *f;
 	struct stat st;
 
-	f = sys_fopen(dyn_CONFIGFILE,"w");
+	f = sys_fopen(get_dyn_CONFIGFILE(),"w");
 	if (!f) {
-		printf(_("failed to open %s for writing"), dyn_CONFIGFILE);
+		printf(_("failed to open %s for writing"), get_dyn_CONFIGFILE());
 		printf("\n");
 		return 0;
 	}
@@ -466,7 +466,7 @@ static int save_reload(int snum)
 #if defined HAVE_FCHMOD
 		fchmod(fileno(f), S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
 #else
-		chmod(dyn_CONFIGFILE, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
+		chmod(get_dyn_CONFIGFILE(), S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
 #endif
 	}
 
@@ -478,7 +478,7 @@ static int save_reload(int snum)
 	lp_killunused(NULL);
 
 	if (!load_config(False)) {
-                printf(_("Can't reload %s"), dyn_CONFIGFILE);
+                printf(_("Can't reload %s"), get_dyn_CONFIGFILE());
 		printf("\n");
                 return 0;
         }
@@ -1422,23 +1422,23 @@ const char *lang_msg_rotate(TALLOC_CTX *ctx, const char *msgid)
 	iNumNonAutoPrintServices = lp_numservices();
 	load_printers();
 
-	cgi_setup(dyn_SWATDIR, !demo_mode);
+	cgi_setup(get_dyn_SWATDIR(), !demo_mode);
 
 	print_header();
 
 	cgi_load_variables();
 
-	if (!file_exist(dyn_CONFIGFILE, NULL)) {
+	if (!file_exist(get_dyn_CONFIGFILE(), NULL)) {
 		have_read_access = True;
 		have_write_access = True;
 	} else {
 		/* check if the authenticated user has write access - if not then
 		   don't show write options */
-		have_write_access = (access(dyn_CONFIGFILE,W_OK) == 0);
+		have_write_access = (access(get_dyn_CONFIGFILE(),W_OK) == 0);
 
 		/* if the user doesn't have read access to smb.conf then
 		   don't let them view it */
-		have_read_access = (access(dyn_CONFIGFILE,R_OK) == 0);
+		have_read_access = (access(get_dyn_CONFIGFILE(),R_OK) == 0);
 	}
 
 	show_main_buttons();
-- 
cgit 


From 587cf54c61c9f1f7bcae431a82035fd942716c32 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Wed, 23 Jan 2008 11:04:10 +0100
Subject: strtok -> strtok_r (This used to be commit
 fd34ce437057bb34cdc37f4b066e424000d36789)

---
 source3/web/cgi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 07a6fbcf54..c6233b0869 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -164,7 +164,9 @@ 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;
 			
-- 
cgit 


From 2762b9a97582b9b28fd5985ba8e3d0299126820e Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Mon, 4 Feb 2008 20:57:35 +0100
Subject: Always pass a TALLOC_CTX to str_list_make and str_list_copy (This
 used to be commit e2c9fc4cf5f0ff725330fa44f53782db65fca37e)

---
 source3/web/neg_lang.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index bb481306e7..82411000cd 100644
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -74,7 +74,7 @@ void web_set_lang(const char *lang_string)
 	int lang_num, i;
 
 	/* build the lang list */
-	lang_list = str_list_make(lang_string, ", \t\r\n");
+	lang_list = str_list_make(talloc_tos(), lang_string, ", \t\r\n");
 	if (!lang_list) return;
 	
 	/* sort the list by priority */
@@ -100,7 +100,7 @@ void web_set_lang(const char *lang_string)
 		}
 		pl[i].string = SMB_STRDUP(lang_list[i]);
 	}
-	str_list_free(&lang_list);
+	TALLOC_FREE(lang_list);
 
 	qsort(pl, lang_num, sizeof(struct pri_list), &qsort_cmp_list);
 
-- 
cgit 


From 90fd5082a2084cf2436105938b47591cce6a9f82 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Wed, 12 Mar 2008 00:54:48 +0100
Subject: loadparm: add convenience wrapper lp_kill_all_services()

Michael
(This used to be commit 32bfd131e33d06be9dfaef02b57f5401d2bc7639)
---
 source3/web/swat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 2cf0eabeed..bb418db04b 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -475,7 +475,7 @@ static int save_reload(int snum)
 		lp_dump_one(f, False, snum);
 	fclose(f);
 
-	lp_killunused(NULL);
+	lp_kill_all_services();
 
 	if (!load_config(False)) {
                 printf(_("Can't reload %s"), get_dyn_CONFIGFILE());
-- 
cgit 


From 9644b6cb50ec01c04a0d6ab17a8e39054fd8b0f8 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Fri, 28 Mar 2008 15:49:13 +0100
Subject: Add a talloc context parameter to current_timestring() to fix
 memleaks.

current_timestring used to return a string talloced to talloc_tos().
When called by DEBUG from a TALLOC_FREE, this produced messages
"no talloc stackframe around, leaking memory". For example when
used from net conf.

This also adds a temporary talloc context to alloc_sub_basic().
For this purpose, the exit strategy is slightly altered: a common
exit point is used for success and failure.

Michael
(This used to be commit 16b5800d4e3a8b88bac67b2550d14e0aaaa302a9)
---
 source3/web/swat.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index bb418db04b..6d8f4cae06 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -438,11 +438,15 @@ static bool load_config(bool save_def)
 ****************************************************************************/
 static void write_config(FILE *f, bool show_defaults)
 {
+	TALLOC_CTX *ctx = talloc_stackframe();
+
 	fprintf(f, "# Samba config file created using SWAT\n");
 	fprintf(f, "# from %s (%s)\n", cgi_remote_host(), cgi_remote_addr());
-	fprintf(f, "# Date: %s\n\n", current_timestring(False));
+	fprintf(f, "# Date: %s\n\n", current_timestring(ctx, False));
 	
 	lp_dump(f, show_defaults, iNumNonAutoPrintServices);
+
+	TALLOC_FREE(ctx);
 }
 
 /****************************************************************************
-- 
cgit 


From bb869741ddc3d82da02c96bef592dab6074ff142 Mon Sep 17 00:00:00 2001
From: Tim Prouty <tim.prouty@isilon.com>
Date: Mon, 3 Mar 2008 13:32:54 -0800
Subject: Cleanup size_t return values in convert_string_allocate

This patch is the first iteration of an inside-out conversion to cleanup
functions in charcnv.c returning size_t == -1 to indicate failure.
(This used to be commit 59124382d2894a1b194b48dd82bc5f956959eb48)
---
 source3/web/cgi.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index c6233b0869..28f64f89ad 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -202,19 +202,19 @@ void cgi_load_variables(void)
 	   to our internal unix charset before use */
 	for (i=0;i<num_variables;i++) {
 		TALLOC_CTX *frame = talloc_stackframe();
-		char *dest;
+		char *dest = NULL;
+		size_t dest_len;
 
-		dest = NULL;
 		convert_string_allocate(frame, CH_UTF8, CH_UNIX,
 			       variables[i].name, -1,
-			       &dest, True);
+			       &dest, &dest_len, True);
 		SAFE_FREE(variables[i].name);
 		variables[i].name = SMB_STRDUP(dest ? dest : "");
 
 		dest = NULL;
 		convert_string_allocate(frame, CH_UTF8, CH_UNIX,
 			       variables[i].value, -1,
-			       &dest, True);
+			       &dest, &dest_len, True);
 		SAFE_FREE(variables[i].value);
 		variables[i].value = SMB_STRDUP(dest ? dest : "");
 		TALLOC_FREE(frame);
-- 
cgit 


From 611c96d078dc533690a8a1ebafa89a1b76296cc0 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 18 May 2008 23:16:38 +0200
Subject: swat: freeze swat_proto.h from "make proto"

Michael
(This used to be commit 372c58cc220efc01af4b90b82b75191296a62e81)
---
 source3/web/swat_proto.h | 70 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 source3/web/swat_proto.h

(limited to 'source3/web')

diff --git a/source3/web/swat_proto.h b/source3/web/swat_proto.h
new file mode 100644
index 0000000000..0f84e4f4ce
--- /dev/null
+++ b/source3/web/swat_proto.h
@@ -0,0 +1,70 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * collected prototypes header
+ *
+ * frozen from "make proto" in May 2008
+ *
+ * Copyright (C) Michael Adam 2008
+ *
+ * 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 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _SWAT_PROTO_H_
+#define _SWAT_PROTO_H_
+
+
+/* The following definitions come from web/cgi.c  */
+
+void cgi_load_variables(void);
+const char *cgi_variable(const char *name);
+const char *cgi_variable_nonull(const char *name);
+bool am_root(void);
+char *cgi_user_name(void);
+void cgi_setup(const char *rootdir, int auth_required);
+const char *cgi_baseurl(void);
+const char *cgi_pathinfo(void);
+const char *cgi_remote_host(void);
+const char *cgi_remote_addr(void);
+bool cgi_waspost(void);
+
+/* The following definitions come from web/diagnose.c  */
+
+bool winbindd_running(void);
+bool nmbd_running(void);
+bool smbd_running(void);
+
+/* The following definitions come from web/neg_lang.c  */
+
+int web_open(const char *fname, int flags, mode_t mode);
+void web_set_lang(const char *lang_string);
+
+/* The following definitions come from web/startstop.c  */
+
+void start_smbd(void);
+void start_nmbd(void);
+void start_winbindd(void);
+void stop_smbd(void);
+void stop_nmbd(void);
+void stop_winbindd(void);
+void kill_pid(struct server_id pid);
+
+/* The following definitions come from web/statuspage.c  */
+
+void status_page(void);
+
+/* The following definitions come from web/swat.c  */
+
+const char *lang_msg_rotate(TALLOC_CTX *ctx, const char *msgid);
+
+#endif /*  _SWAT_PROTO_H_  */
-- 
cgit 


From fb37f156009611af0dd454a0fb0829a09cd638ac Mon Sep 17 00:00:00 2001
From: Tim Prouty <tim.prouty@isilon.com>
Date: Tue, 29 Apr 2008 14:36:24 -0700
Subject: Cleanup size_t return values in callers of convert_string_allocate

This patch is the second iteration of an inside-out conversion to cleanup
functions in charcnv.c returning size_t == -1 to indicate failure.
(This used to be commit 6b189dabc562d86dcaa685419d0cb6ea276f100d)
---
 source3/web/statuspage.c |  3 ++-
 source3/web/swat.c       | 14 ++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index eda53b66ab..ce24c7cddd 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -123,6 +123,7 @@ static void print_share_mode(const struct share_mode_entry *e,
 {
 	char           *utf8_fname;
 	int deny_mode;
+	size_t converted_size;
 
 	if (!is_valid_share_mode_entry(e)) {
 		return;
@@ -169,7 +170,7 @@ static void print_share_mode(const struct share_mode_entry *e,
 		printf("NONE            ");
 	printf("</td>");
 
-	push_utf8_allocate(&utf8_fname, fname);
+	push_utf8_allocate(&utf8_fname, fname, &converted_size);
 	printf("<td>%s</td><td>%s</td></tr>\n",
 	       utf8_fname,tstring(talloc_tos(),e->time.tv_sec));
 	SAFE_FREE(utf8_fname);
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 6d8f4cae06..3e14d2d098 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -228,6 +228,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 	int i;
 	void *ptr = parm->ptr;
 	char *utf8_s1, *utf8_s2;
+	size_t converted_size;
 	TALLOC_CTX *ctx = talloc_stackframe();
 
 	if (parm->p_class == P_LOCAL && snum >= 0) {
@@ -252,12 +253,12 @@ static void show_parameter(int snum, struct parm_struct *parm)
 			for (;*list;list++) {
 				/* enclose in HTML encoded quotes if the string contains a space */
 				if ( strchr_m(*list, ' ') ) {
-					push_utf8_allocate(&utf8_s1, *list);
-					push_utf8_allocate(&utf8_s2, ((*(list+1))?", ":""));
+					push_utf8_allocate(&utf8_s1, *list, &converted_size);
+					push_utf8_allocate(&utf8_s2, ((*(list+1))?", ":""), &converted_size);
 					printf("&quot;%s&quot;%s", utf8_s1, utf8_s2);
 				} else {
-					push_utf8_allocate(&utf8_s1, *list);
-					push_utf8_allocate(&utf8_s2, ((*(list+1))?", ":""));
+					push_utf8_allocate(&utf8_s1, *list, &converted_size);
+					push_utf8_allocate(&utf8_s2, ((*(list+1))?", ":""), &converted_size);
 					printf("%s%s", utf8_s1, utf8_s2);
 				}
 				SAFE_FREE(utf8_s1);
@@ -282,7 +283,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
 
 	case P_STRING:
 	case P_USTRING:
-		push_utf8_allocate(&utf8_s1, *(char **)ptr);
+		push_utf8_allocate(&utf8_s1, *(char **)ptr, &converted_size);
 		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
 		       make_parm_name(parm->label), fix_quotes(ctx, utf8_s1));
 		SAFE_FREE(utf8_s1);
@@ -897,6 +898,7 @@ static void shares_page(void)
 	int i;
 	int mode = 0;
 	unsigned int parm_filter = FLAG_BASIC;
+	size_t converted_size;
 
 	if (share)
 		snum = lp_servicenumber(share);
@@ -951,7 +953,7 @@ static void shares_page(void)
 	for (i=0;i<lp_numservices();i++) {
 		s = lp_servicename(i);
 		if (s && (*s) && strcmp(s,"IPC$") && !lp_print_ok(i)) {
-			push_utf8_allocate(&utf8_s, s);
+			push_utf8_allocate(&utf8_s, s, &converted_size);
 			printf("<option %s value=\"%s\">%s\n", 
 			       (share && strcmp(share,s)==0)?"SELECTED":"",
 			       utf8_s, utf8_s);
-- 
cgit 


From 0d556eabdecbcee20e947cd81c50fd8bca79af46 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <anschneider@suse.de>
Date: Tue, 3 Jun 2008 15:05:50 +0200
Subject: Fix saving of the config file in SWAT; [#5516].

The strlen of the source string passed to convert_string_allocate was too
short :)

Signed-off-by: Stefan Metzmacher <metze@samba.org>
(This used to be commit ac3597ef8b7781499ab55f1039670ec82202e32c)
---
 source3/web/cgi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 28f64f89ad..070e80cf91 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -206,14 +206,14 @@ void cgi_load_variables(void)
 		size_t dest_len;
 
 		convert_string_allocate(frame, CH_UTF8, CH_UNIX,
-			       variables[i].name, -1,
+			       variables[i].name, strlen(variables[i].name),
 			       &dest, &dest_len, True);
 		SAFE_FREE(variables[i].name);
 		variables[i].name = SMB_STRDUP(dest ? dest : "");
 
 		dest = NULL;
 		convert_string_allocate(frame, CH_UTF8, CH_UNIX,
-			       variables[i].value, -1,
+			       variables[i].value, strlen(variables[i].value),
 			       &dest, &dest_len, True);
 		SAFE_FREE(variables[i].value);
 		variables[i].value = SMB_STRDUP(dest ? dest : "");
-- 
cgit 


From 8c7e21679b69eab4319efb484630cddfaf973e36 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <anschneider@suse.de>
Date: Tue, 3 Jun 2008 15:26:42 +0200
Subject: Fix empty input fields in SWAT; [#5515].

Signed-off-by: Stefan Metzmacher <metze@samba.org>
(This used to be commit e1579c90fb27c07f95889dd8778daeef53e2ac16)
---
 source3/web/swat.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 3e14d2d098..373ab73127 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -86,13 +86,14 @@ static const char *fix_quotes(TALLOC_CTX *ctx, const char *str)
 
 	/* Count the number of quotes. */
 	newstring_len = 1;
-	while (*str) {
-		if ( *str == '\"') {
+	p = (char *) str;
+	while (*p) {
+		if ( *p == '\"') {
 			newstring_len += quote_len;
 		} else {
 			newstring_len++;
 		}
-		++str;
+		++p;
 	}
 	newstring = TALLOC_ARRAY(ctx, char, newstring_len);
 	if (!newstring) {
@@ -105,7 +106,6 @@ static const char *fix_quotes(TALLOC_CTX *ctx, const char *str)
 		} else {
 			*p++ = *str;
 		}
-		++str;
 	}
 	*p = '\0';
 	return newstring;
-- 
cgit 


From 24eec914c0d5a2ff6b6e8b0ee0bc000a9af13d4f Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 15 Jul 2008 14:37:48 -0700
Subject: Fix swat. Bug #5613. Jeremy (This used to be commit
 15920f838835f5dbbac8712202267c2a99237686)

---
 source3/web/swat.c | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'source3/web')

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 373ab73127..1502c5bc2f 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -430,7 +430,6 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
 ****************************************************************************/
 static bool load_config(bool save_def)
 {
-	lp_resetnumservices();
 	return lp_load(get_dyn_CONFIGFILE(),False,save_def,False,True);
 }
 
@@ -740,12 +739,12 @@ static void wizard_page(void)
 
 			load_config(False);
 			lp_copy_service(GLOBAL_SECTION_SNUM, unix_share);
-			iNumNonAutoPrintServices = lp_numservices();
 			have_home = lp_servicenumber(HOMES_NAME);
 			lp_do_parameter( have_home, "read only", "No");
 			lp_do_parameter( have_home, "valid users", "%S");
 			lp_do_parameter( have_home, "browseable", "No");
 			commit_parameters(have_home);
+			save_reload(have_home);
 		}
 
 		/* Need to Delete Homes share? */
@@ -908,6 +907,7 @@ static void shares_page(void)
 	if (cgi_variable("Commit") && snum >= 0) {
 		commit_parameters(snum);
 		save_reload(0);
+		snum = lp_servicenumber(share);
 	}
 
 	if (cgi_variable("Delete") && snum >= 0) {
@@ -918,11 +918,14 @@ static void shares_page(void)
 	}
 
 	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
-		load_config(False);
-		lp_copy_service(GLOBAL_SECTION_SNUM, share);
-		iNumNonAutoPrintServices = lp_numservices();
-		save_reload(0);
 		snum = lp_servicenumber(share);
+		if (snum < 0) {
+			load_config(False);
+			lp_copy_service(GLOBAL_SECTION_SNUM, share);
+			snum = lp_servicenumber(share);
+			save_reload(snum);
+			snum = lp_servicenumber(share);
+		}
 	}
 
 	printf("<FORM name=\"swatform\" method=post>\n");
@@ -958,7 +961,6 @@ static void shares_page(void)
 			       (share && strcmp(share,s)==0)?"SELECTED":"",
 			       utf8_s, utf8_s);
 			SAFE_FREE(utf8_s);
-			
 		}
 	}
 	printf("</select></td>\n");
@@ -1261,6 +1263,7 @@ static void printers_page(void)
 		    save_reload(snum);
 		else
 		    save_reload(0);
+		snum = lp_servicenumber(share);
 	}
 
 	if (cgi_variable("Delete") && snum >= 0) {
@@ -1271,13 +1274,15 @@ static void printers_page(void)
 	}
 
 	if (cgi_variable("createshare") && (share=cgi_variable("newshare"))) {
-		load_config(False);
-		lp_copy_service(GLOBAL_SECTION_SNUM, share);
-		iNumNonAutoPrintServices = lp_numservices();
-		snum = lp_servicenumber(share);
-		lp_do_parameter(snum, "print ok", "Yes");
-		save_reload(0);
 		snum = lp_servicenumber(share);
+		if (snum < 0 || snum >= iNumNonAutoPrintServices) {
+			load_config(False);
+			lp_copy_service(GLOBAL_SECTION_SNUM, share);
+			snum = lp_servicenumber(share);
+			lp_do_parameter(snum, "print ok", "Yes");
+			save_reload(snum);
+			snum = lp_servicenumber(share);
+		}
 	}
 
 	printf("<FORM name=\"swatform\" method=post>\n");
-- 
cgit