diff options
Diffstat (limited to 'source3/web')
-rw-r--r-- | source3/web/.cvsignore | 1 | ||||
-rw-r--r-- | source3/web/cgi.c | 2 | ||||
-rw-r--r-- | source3/web/diagnose.c | 6 | ||||
-rw-r--r-- | source3/web/neg_lang.c | 1 | ||||
-rw-r--r-- | source3/web/startstop.c | 2 | ||||
-rw-r--r-- | source3/web/statuspage.c | 1 | ||||
-rw-r--r-- | source3/web/swat.c | 3 |
7 files changed, 6 insertions, 10 deletions
diff --git a/source3/web/.cvsignore b/source3/web/.cvsignore index ed29eafc6b..e69de29bb2 100644 --- a/source3/web/.cvsignore +++ b/source3/web/.cvsignore @@ -1 +0,0 @@ -swat_proto.h
\ No newline at end of file diff --git a/source3/web/cgi.c b/source3/web/cgi.c index 7415fbe3f1..e785ce92d8 100644 --- a/source3/web/cgi.c +++ b/source3/web/cgi.c @@ -19,7 +19,7 @@ #include "includes.h" -#include "../web/swat_proto.h" +#include "smb.h" #define MAX_VARIABLES 10000 diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c index e822474aab..73c23ea2bb 100644 --- a/source3/web/diagnose.c +++ b/source3/web/diagnose.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "../web/swat_proto.h" +#include "smb.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, flags; + int fd, count; 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, &flags, NULL)) != NULL) { + &count)) != NULL) { SAFE_FREE(ip_list); close(fd); return True; diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c index 88bc5498e9..fc115bfd61 100644 --- a/source3/web/neg_lang.c +++ b/source3/web/neg_lang.c @@ -20,7 +20,6 @@ */ #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 893784dd55..c56320c962 100644 --- a/source3/web/startstop.c +++ b/source3/web/startstop.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "../web/swat_proto.h" +#include "smb.h" #include "dynconfig.h" /** Need to wait for daemons to startup */ diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c index 792e077a61..62158a5f32 100644 --- a/source3/web/statuspage.c +++ b/source3/web/statuspage.c @@ -19,7 +19,6 @@ */ #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 7be46790db..955cbb0748 100644 --- a/source3/web/swat.c +++ b/source3/web/swat.c @@ -27,7 +27,6 @@ **/ #include "includes.h" -#include "../web/swat_proto.h" #define GLOBALS_SNUM -1 @@ -330,7 +329,7 @@ static void show_parameters(int snum, int allparameters, int advanced, int print break; case P_LIST: - if (!str_list_compare(*(char ***)ptr, (char **)(parm->def.lvalue))) continue; + if (!lp_list_compare(*(char ***)ptr, (char **)(parm->def.lvalue))) continue; break; case P_STRING: |