summaryrefslogtreecommitdiffstats
path: root/source3/param/loadparm.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2014-01-15 14:48:40 +1300
committerAndrew Bartlett <abartlet@samba.org>2014-02-12 13:17:13 +1300
commit86850860f871700da02000f5b7af374563134344 (patch)
treef667e5e2a3e45f60fa7c37501b4f2b436f9e8041 /source3/param/loadparm.c
parentaea623e050530ad79c47e590373ad8241eb3914d (diff)
downloadsamba-86850860f871700da02000f5b7af374563134344.tar.gz
samba-86850860f871700da02000f5b7af374563134344.tar.xz
samba-86850860f871700da02000f5b7af374563134344.zip
lib/param: Normalise "read raw" and "write raw" parameters
They have been changed to function like normal parameters, removing a special case in the loadparm system. Andrew Bartlett Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/param/loadparm.c')
-rw-r--r--source3/param/loadparm.c23
1 files changed, 2 insertions, 21 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index b4b79aaa29d..0fce5399685 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -827,8 +827,8 @@ static void init_globals(bool reinit_globals)
Globals.winbind_sealed_pipes = true;
Globals.require_strong_key = true;
Globals.server_schannel = Auto;
- Globals.bReadRaw = true;
- Globals.bWriteRaw = true;
+ Globals.read_raw = true;
+ Globals.write_raw = true;
Globals.null_passwords = false;
Globals.obey_pam_restrictions = false;
Globals.syslog = 1;
@@ -1165,9 +1165,6 @@ char *lp_ ## fn_name(TALLOC_CTX *ctx,int i) {return(lp_string((ctx), (LP_SNUM_OK
char lp_ ## fn_name(const struct share_params *p) {return(LP_SNUM_OK(p->service)? ServicePtrs[(p->service)]->val : sDefault.val);}
-static FN_GLOBAL_BOOL(_readraw, bReadRaw)
-static FN_GLOBAL_BOOL(_writeraw, bWriteRaw)
-
/* If lp_statedir() and lp_cachedir() are explicitely set during the
* build process or in smb.conf, we use that value. Otherwise they
* default to the value of lp_lock_directory(). */
@@ -5301,22 +5298,6 @@ bool lp_widelinks(int snum)
return lp_widelinks_internal(snum);
}
-bool lp_writeraw(void)
-{
- if (lp_async_smb_echo_handler()) {
- return false;
- }
- return lp__writeraw();
-}
-
-bool lp_readraw(void)
-{
- if (lp_async_smb_echo_handler()) {
- return false;
- }
- return lp__readraw();
-}
-
int lp_server_role(void)
{
return lp_find_server_role(lp__server_role(),