summaryrefslogtreecommitdiff
path: root/source3/web
diff options
context:
space:
mode:
Diffstat (limited to 'source3/web')
-rw-r--r--source3/web/cgi.c12
-rw-r--r--source3/web/diagnose.c6
-rw-r--r--source3/web/statuspage.c2
-rw-r--r--source3/web/swat.c30
4 files changed, 25 insertions, 25 deletions
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 */