From 4481259f78aea0a69a936bf1c57c4453423cf1c1 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Fri, 23 Oct 2020 17:45:59 +0200 Subject: [PATCH] smb: rename NTCREATEX_OPTIONS_PRIVATE_DELETE_ON_CLOSE to NTCREATEX_FLAG_DELETE_ON_CLOSE Just a shorter name, no change in behaviour. Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison --- source3/include/smb.h | 2 +- source3/printing/printspoolss.c | 2 +- source3/smbd/smb2_setinfo.c | 2 +- source3/smbd/trans2.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source3/include/smb.h b/source3/include/smb.h index 382ad08d430..51cbc442e8e 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -409,7 +409,7 @@ Offset Data length. #define NTCREATEX_FLAG_DENY_FCB 0x0002 /* Private options for printer support */ -#define NTCREATEX_OPTIONS_PRIVATE_DELETE_ON_CLOSE 0x0008 +#define NTCREATEX_FLAG_DELETE_ON_CLOSE 0x0008 /* Private option for streams support */ #define NTCREATEX_OPTIONS_PRIVATE_STREAM_BASEOPEN 0x0010 diff --git a/source3/printing/printspoolss.c b/source3/printing/printspoolss.c index c1247685831..f3376d8f31e 100644 --- a/source3/printing/printspoolss.c +++ b/source3/printing/printspoolss.c @@ -318,7 +318,7 @@ void print_spool_end(files_struct *fsp, enum file_close_type close_type) struct dcerpc_binding_handle *b = NULL; if (fsp->fh->private_options & - NTCREATEX_OPTIONS_PRIVATE_DELETE_ON_CLOSE) { + NTCREATEX_FLAG_DELETE_ON_CLOSE) { int ret; /* diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c index 43dc232a6d6..fdda9b5af3c 100644 --- a/source3/smbd/smb2_setinfo.c +++ b/source3/smbd/smb2_setinfo.c @@ -449,7 +449,7 @@ static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx, if ((file_info_level == SMB_SET_FILE_DISPOSITION_INFO) && in_input_buffer.length >= 1 && CVAL(in_input_buffer.data,0)) { - fsp->fh->private_options |= NTCREATEX_OPTIONS_PRIVATE_DELETE_ON_CLOSE; + fsp->fh->private_options |= NTCREATEX_FLAG_DELETE_ON_CLOSE; DEBUG(3,("smbd_smb2_setinfo_send: " "Cancelling print job (%s)\n", diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 2e2b9e899a5..ab1ada8e356 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -9368,7 +9368,7 @@ static void call_trans2setfilepathinfo(connection_struct *conn, * Doing a DELETE_ON_CLOSE should cancel a print job. */ if ((info_level == SMB_SET_FILE_DISPOSITION_INFO) && CVAL(pdata,0)) { - fsp->fh->private_options |= NTCREATEX_OPTIONS_PRIVATE_DELETE_ON_CLOSE; + fsp->fh->private_options |= NTCREATEX_FLAG_DELETE_ON_CLOSE; DEBUG(3,("call_trans2setfilepathinfo: " "Cancelling print job (%s)\n",