summaryrefslogtreecommitdiff
path: root/source3/web
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-06-24 20:25:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:58:00 -0500
commit19ca97a70f6b7b41d251eaa76e4d3c980c6eedff (patch)
tree18d7d81e2c1aa7cf9325899b7e8fc90b41c14c8b /source3/web
parent8387af752f81e26f1c141f6053bf6d106f0af5eb (diff)
downloadsamba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.gz
samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.bz2
samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.zip
r7882: Looks like a large patch - but what it actually does is make Samba
safe for using our headers and linking with C++ modules. Stops us from using C++ reserved keywords in our code. Jeremy (This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
Diffstat (limited to 'source3/web')
-rw-r--r--source3/web/diagnose.c4
-rw-r--r--source3/web/swat.c10
2 files changed, 5 insertions, 9 deletions
diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index f4b022cf58..d259717da0 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -25,10 +25,6 @@ extern struct in_addr loopback_ip;
#ifdef WITH_WINBIND
-NSS_STATUS winbindd_request(int req_type,
- struct winbindd_request *request,
- struct winbindd_response *response);
-
/* check to see if winbind is running by pinging it */
BOOL winbindd_running(void)
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 8505f1a685..14889e35aa 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -216,7 +216,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
void *ptr = parm->ptr;
char *utf8_s1, *utf8_s2;
- if (parm->class == P_LOCAL && snum >= 0) {
+ if (parm->p_class == P_LOCAL && snum >= 0) {
ptr = lp_local_ptr(snum, ptr);
}
@@ -344,9 +344,9 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
const char *last_heading = NULL;
while ((parm = lp_next_parameter(snum, &i, allparameters))) {
- if (snum < 0 && parm->class == P_LOCAL && !(parm->flags & FLAG_GLOBAL))
+ if (snum < 0 && parm->p_class == P_LOCAL && !(parm->flags & FLAG_GLOBAL))
continue;
- if (parm->class == P_SEPARATOR) {
+ if (parm->p_class == P_SEPARATOR) {
heading = parm->label;
continue;
}
@@ -360,7 +360,7 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
if (!(parm->flags & FLAG_BASIC)) {
void *ptr = parm->ptr;
- if (parm->class == P_LOCAL && snum >= 0) {
+ if (parm->p_class == P_LOCAL && snum >= 0) {
ptr = lp_local_ptr(snum, ptr);
}
@@ -488,7 +488,7 @@ static void commit_parameter(int snum, struct parm_struct *parm, const char *v)
int i;
char *s;
- if (snum < 0 && parm->class == P_LOCAL) {
+ if (snum < 0 && parm->p_class == P_LOCAL) {
/* this handles the case where we are changing a local
variable globally. We need to change the parameter in
all shares where it is currently set to the default */