summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-10-02 14:29:20 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:07:40 -0500
commit8ffc4c1f97bf40cf19812b086cab2c48ff9aed9d (patch)
treeb8d209668e7fc6c087a79685c7ef9835be47e962
parentf5f6d6d2ab09aa0d0f0b659a07f9fe81920eeca2 (diff)
downloadsamba-8ffc4c1f97bf40cf19812b086cab2c48ff9aed9d.tar.gz
samba-8ffc4c1f97bf40cf19812b086cab2c48ff9aed9d.tar.bz2
samba-8ffc4c1f97bf40cf19812b086cab2c48ff9aed9d.zip
r25462: Remove refernece to categories from js as well.
(This used to be commit 12d7cccd7c8c632e2d49e9c21e0e139366ffe2c3)
-rw-r--r--source4/param/loadparm.c62
-rw-r--r--source4/scripting/ejs/smbcalls_config.c25
2 files changed, 31 insertions, 56 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 809a9173c4..043e7d2ba8 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -120,9 +120,9 @@ struct loadparm_global
char *szWinbinddSocketDirectory;
char *szTemplateShell;
char *szTemplateHomedir;
- int bWinbindSealedPipes;
+ bool bWinbindSealedPipes;
char *swat_directory;
- int tls_enabled;
+ bool tls_enabled;
char *tls_keyfile;
char *tls_certfile;
char *tls_cafile;
@@ -135,8 +135,8 @@ struct loadparm_global
int srv_minprotocol;
int cli_maxprotocol;
int cli_minprotocol;
- int security;
- int paranoid_server_security;
+ enum security_types security;
+ bool paranoid_server_security;
int max_wins_ttl;
int min_wins_ttl;
int announce_as; /* This is initialised in init_globals */
@@ -147,35 +147,35 @@ struct loadparm_global
int kpasswd_port;
int web_port;
char *socket_options;
- int bWINSsupport;
- int bWINSdnsProxy;
+ bool bWINSsupport;
+ bool bWINSdnsProxy;
char *szWINSHook;
- int bLocalMaster;
- int bPreferredMaster;
- int bEncryptPasswords;
- int bNullPasswords;
- int bObeyPamRestrictions;
- int bLargeReadwrite;
- int bReadRaw;
- int bWriteRaw;
- int bTimeServer;
- int bBindInterfacesOnly;
- int bNTSmbSupport;
- int bNTStatusSupport;
- int bLanmanAuth;
- int bNTLMAuth;
- int bUseSpnego;
+ bool bLocalMaster;
+ bool bPreferredMaster;
+ bool bEncryptPasswords;
+ bool bNullPasswords;
+ bool bObeyPamRestrictions;
+ bool bLargeReadwrite;
+ bool bReadRaw;
+ bool bWriteRaw;
+ bool bTimeServer;
+ bool bBindInterfacesOnly;
+ bool bNTSmbSupport;
+ bool bNTStatusSupport;
+ bool bLanmanAuth;
+ bool bNTLMAuth;
+ bool bUseSpnego;
int server_signing;
int client_signing;
- int bClientPlaintextAuth;
- int bClientLanManAuth;
- int bClientNTLMv2Auth;
- int client_use_spnego_principal;
- int bHostMSDfs;
- int bUnicode;
- int bUnixExtensions;
- int bDisableNetbios;
- int bRpcBigEndian;
+ bool bClientPlaintextAuth;
+ bool bClientLanManAuth;
+ bool bClientNTLMv2Auth;
+ bool client_use_spnego_principal;
+ bool bHostMSDfs;
+ bool bUnicode;
+ bool bUnixExtensions;
+ bool bDisableNetbios;
+ bool bRpcBigEndian;
struct param_opt *param_opt;
};
@@ -2033,7 +2033,7 @@ static bool do_section(const char *pszSectionName, void *userdata)
/***************************************************************************
- Determine if a partcular base parameter is currentl set to the default value.
+ Determine if a particular base parameter is currentl set to the default value.
***************************************************************************/
static bool is_default(int i)
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index ae7dea6819..6b9c245e7e 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -46,27 +46,6 @@ static int ejs_lpServices(MprVarHandle eid, int argc, char **argv)
/*
- return a list of parameter categories
-*/
-static int ejs_lpCategories(MprVarHandle eid, int argc, char **argv)
-{
- struct parm_struct *parm_table = lp_parm_table();
- int i;
- const char **list = NULL;
- if (argc != 0) return -1;
-
- for (i=0;parm_table[i].label;i++) {
- if (parm_table[i].class == P_SEPARATOR) {
- list = str_list_add(list, parm_table[i].label);
- }
- }
- talloc_steal(mprMemCtx(), list);
- mpr_Return(eid, mprList("categories", list));
- return 0;
-}
-
-
-/*
allow access to loadparm variables from inside ejs scripts in web apps
can be called in 4 ways:
@@ -178,9 +157,6 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
case P_LIST:
mpr_Return(eid, mprList(parm->label, *(const char ***)parm_ptr));
break;
- case P_SEP:
- mpr_Return(eid, mprCreateUndefinedVar());
- return 0;
}
return 0;
}
@@ -230,7 +206,6 @@ static int ejs_loadparm_init(MprVarHandle eid, int argc, struct MprVar **argv)
mprSetStringCFunction(obj, "set", ejs_lpSet);
mprSetStringCFunction(obj, "reload", ejs_lpReload);
mprSetStringCFunction(obj, "services", ejs_lpServices);
- mprSetStringCFunction(obj, "categories", ejs_lpCategories);
return 0;
}