4 files changed, 9 insertions, 12 deletions
diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index fa2304016e..cc31eef97e 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -118,7 +118,7 @@ void cgi_load_variables(void)
 #ifdef DEBUG_COMMENTS
 	char dummy[100]="";
 	print_title(dummy);
-	d_printf("<!== Start dump in cgi_load_variables() %s ==>\n",__FILE__);
+	printf("<!== Start dump in cgi_load_variables() %s ==>\n",__FILE__);
 #endif
 
 	if (!content_length) {
@@ -275,7 +275,7 @@ static void cgi_setup_error(const char *err, const char *header, const char *inf
 		}
 	}
 
-	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);
+	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);
diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index cf93991f94..abb4d79b9a 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "web/swat_proto.h"
 #include "lib/winbind_util.h"
+#include "libsmb/libsmb.h"
 
 #ifdef WITH_WINBIND
 
@@ -69,15 +70,11 @@ bool smbd_running(void)
 	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(), &ss);
+	status = cli_connect_nb("localhost", &ss, 0, 0x20, lp_netbios_name(),
+				Undefined, &cli);
 	if (!NT_STATUS_IS_OK(status)) {
-		cli_shutdown(cli);
-		return False;
+		return false;
 	}
-
 	cli_shutdown(cli);
 	return True;
 }
diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 81350e62f5..e23acf8931 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "web/swat_proto.h"
-#include "dynconfig.h"
+#include "dynconfig/dynconfig.h"
 
 
 /** Startup smbd from web interface. */
diff --git a/source3/web/swat.c b/source3/web/swat.c
index f06bf5ed26..277b25c426 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -83,7 +83,7 @@ static char *fix_backslash(const char *str)
 	return newstring;
 }
 
-static const char *fix_quotes(TALLOC_CTX *ctx, const char *str)
+static const char *fix_quotes(TALLOC_CTX *ctx, char *str)
 {
 	char *newstring = NULL;
 	char *p = NULL;
@@ -101,7 +101,7 @@ static const char *fix_quotes(TALLOC_CTX *ctx, const char *str)
 		}
 		++p;
 	}
-	newstring = TALLOC_ARRAY(ctx, char, newstring_len);
+	newstring = talloc_array(ctx, char, newstring_len);
 	if (!newstring) {
 		return "";
 	}