summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-07-17 00:48:21 +0000
committerJeremy Allison <jra@samba.org>2003-07-17 00:48:21 +0000
commitf1b6cd794dd5de853c4b068361a326160a3d0384 (patch)
tree4a2d3f677b6ed96d05f420a3580a086574115954 /source3/param
parent6ab5e14494ed6b579658f4fe3410759582d909cd (diff)
downloadsamba-f1b6cd794dd5de853c4b068361a326160a3d0384.tar.gz
samba-f1b6cd794dd5de853c4b068361a326160a3d0384.tar.bz2
samba-f1b6cd794dd5de853c4b068361a326160a3d0384.zip
Putting the framework for server signing in place. Ensure we don't use
sendfile when signing (I need to add this for readbraw/writebraw too...). Jeremy. (This used to be commit f2e84f1ba67b13ff29e24a38099b559d9033a680)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 3739407810..1af8d51114 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1864,7 +1864,7 @@ FN_LOCAL_BOOL(lp_inherit_acls, bInheritACLS)
FN_LOCAL_BOOL(lp_use_client_driver, bUseClientDriver)
FN_LOCAL_BOOL(lp_default_devmode, bDefaultDevmode)
FN_LOCAL_BOOL(lp_nt_acl_support, bNTAclSupport)
-FN_LOCAL_BOOL(lp_use_sendfile, bUseSendfile)
+FN_LOCAL_BOOL(_lp_use_sendfile, bUseSendfile)
FN_LOCAL_BOOL(lp_profile_acls, bProfileAcls)
FN_LOCAL_BOOL(lp_map_acl_inherit, bMap_acl_inherit)
FN_LOCAL_INTEGER(lp_create_mask, iCreate_mask)
@@ -4291,3 +4291,12 @@ int lp_maxprintjobs(int snum)
return maxjobs;
}
+
+/*******************************************************************
+ Ensure we don't use sendfile if server smb signing is active.
+********************************************************************/
+
+BOOL lp_use_sendfile(int snum)
+{
+ return (_lp_use_sendfile(snum) && !srv_signing_active());
+}