svn commit: samba r25462 - in branches/SAMBA_4_0: . source/param
source/scripting/ejs
jelmer at samba.org
jelmer at samba.org
Tue Oct 2 14:29:23 GMT 2007
Author: jelmer
Date: 2007-10-02 14:29:20 +0000 (Tue, 02 Oct 2007)
New Revision: 25462
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25462
Log:
Remove refernece to categories from js as well.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/param/loadparm.c
branches/SAMBA_4_0/source/scripting/ejs/smbcalls_config.c
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c 2007-10-02 13:30:10 UTC (rev 25461)
+++ branches/SAMBA_4_0/source/param/loadparm.c 2007-10-02 14:29:20 UTC (rev 25462)
@@ -120,9 +120,9 @@
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 @@
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 @@
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 @@
/***************************************************************************
- 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)
Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_config.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_config.c 2007-10-02 13:30:10 UTC (rev 25461)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_config.c 2007-10-02 14:29:20 UTC (rev 25462)
@@ -46,27 +46,6 @@
/*
- 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 @@
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 @@
mprSetStringCFunction(obj, "set", ejs_lpSet);
mprSetStringCFunction(obj, "reload", ejs_lpReload);
mprSetStringCFunction(obj, "services", ejs_lpServices);
- mprSetStringCFunction(obj, "categories", ejs_lpCategories);
return 0;
}
More information about the samba-cvs
mailing list