summaryrefslogtreecommitdiffstats
path: root/source3/web
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2002-07-15 10:35:28 +0000
committerAndrew Tridgell <tridge@samba.org>2002-07-15 10:35:28 +0000
commite90b65284812aaa5ff9e9935ce9bbad7791cbbcd (patch)
tree9e744d1dc2f93934a4b49166a37383d3cb2b2139 /source3/web
parentec167dc9cc0ec2ee461837c25a371d2981744208 (diff)
downloadsamba-e90b65284812aaa5ff9e9935ce9bbad7791cbbcd.tar.gz
samba-e90b65284812aaa5ff9e9935ce9bbad7791cbbcd.tar.xz
samba-e90b65284812aaa5ff9e9935ce9bbad7791cbbcd.zip
updated the 3.0 branch from the head branch - ready for alpha18
(This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
Diffstat (limited to 'source3/web')
-rw-r--r--source3/web/.cvsignore1
-rw-r--r--source3/web/cgi.c2
-rw-r--r--source3/web/diagnose.c6
-rw-r--r--source3/web/neg_lang.c1
-rw-r--r--source3/web/startstop.c2
-rw-r--r--source3/web/statuspage.c1
-rw-r--r--source3/web/swat.c3
7 files changed, 10 insertions, 6 deletions
diff --git a/source3/web/.cvsignore b/source3/web/.cvsignore
index e69de29bb2d..ed29eafc6b1 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 e785ce92d8f..7415fbe3f15 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 73c23ea2bb5..e822474aab4 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 fc115bfd618..88bc5498e92 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 c56320c962b..893784dd55e 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 62158a5f329..792e077a616 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 955cbb0748b..7be46790dbe 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: