Move over to RELEASE branch.

Jeremy.

4 files changed, 4 insertions, 3 deletions

diff --git a/source/web/cgi.c b/source/web/cgi.c
index 70299f14c34..0b86265a1e5 100644
--- a/source/web/cgi.c
+++ b/source/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/source/web/diagnose.c b/source/web/diagnose.c
index f22fe0d9b25..bf2e6da17d1 100644
--- a/source/web/diagnose.c
+++ b/source/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;
 		}
diff --git a/source/web/statuspage.c b/source/web/statuspage.c
index fd251f89c50..920d0f3367c 100644
--- a/source/web/statuspage.c
+++ b/source/web/statuspage.c
@@ -39,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);
diff --git a/source/web/swat.c b/source/web/swat.c
index 251707e74e9..d09034671ee 100644
--- a/source/web/swat.c
+++ b/source/web/swat.c
@@ -1026,6 +1026,7 @@ static void printers_page(void)
 	load_config(True);
 	iNumNonAutoPrintServices = lp_numservices();
 	load_printers();
+	codepage_initialise(lp_client_code_page());
 
 	cgi_setup(SWATDIR, !demo_mode);