sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

smbdotconf: mark "veto files" with substitution="1"

Browse Source 
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Ralph Boehme 2019-11-04 12:29:44 +01:00 committed by Stefan Metzmacher
parent 17726dab60
commit 73082f938e
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs-xml/smbdotconf/filename/vetofiles.xml
View File

@ -1,6 +1,7 @@
<samba:parameter name="veto files"
context="S"
type="string"
substitution="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>

4
source3/modules/vfs_fruit.c
View File

@ -1254,6 +1254,8 @@ static int fruit_connect(vfs_handle_struct *handle,
int rc;
char *list = NULL, *newlist = NULL;
struct fruit_config_data *config;
const struct loadparm_substitution *lp_sub =
loadparm_s3_global_substitution();
DEBUG(10, ("fruit_connect\n"));
@ -1271,7 +1273,7 @@ static int fruit_connect(vfs_handle_struct *handle,
struct fruit_config_data, return -1);
if (config->veto_appledouble) {
list = lp_veto_files(talloc_tos(), SNUM(handle->conn));
list = lp_veto_files(talloc_tos(), lp_sub, SNUM(handle->conn));
if (list) {
if (strstr(list, "/" ADOUBLE_NAME_PREFIX "*/") == NULL) {

4
source3/smbd/close.c
View File

@ -927,6 +927,8 @@ static NTSTATUS rmdir_internals(TALLOC_CTX *ctx, files_struct *fsp)
{
connection_struct *conn = fsp->conn;
struct smb_filename *smb_dname = fsp->fsp_name;
const struct loadparm_substitution *lp_sub =
loadparm_s3_global_substitution();
int ret;
SMB_ASSERT(!is_ntfs_stream_smb_fname(smb_dname));
@ -961,7 +963,7 @@ static NTSTATUS rmdir_internals(TALLOC_CTX *ctx, files_struct *fsp)
return NT_STATUS_OK;
}
if(((errno == ENOTEMPTY)||(errno == EEXIST)) && *lp_veto_files(talloc_tos(), SNUM(conn))) {
if(((errno == ENOTEMPTY)||(errno == EEXIST)) && *lp_veto_files(talloc_tos(), lp_sub, SNUM(conn))) {
/*
* Check to see if the only thing in this directory are
* vetoed files/directories. If so then delete them and

2
source3/smbd/service.c
View File

@ -824,7 +824,7 @@ static NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn,
/* Add veto/hide lists */
if (!IS_IPC(conn) && !IS_PRINT(conn)) {
set_namearray( &conn->veto_list,
lp_veto_files(talloc_tos(), snum));
lp_veto_files(talloc_tos(), lp_sub, snum));
set_namearray( &conn->hide_list,
lp_hide_files(talloc_tos(), lp_sub, snum));
set_namearray( &conn->veto_oplock_list,