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 <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 382ad08d430de36e6f919791c7a41a45168045cd..51cbc442e8e1cf6a51dd71f316903df67f6d432a 100644 (file)
--- 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 c1247685831ee9658a8972e6723047dad5c9e935..f3376d8f31ee6ff21eb792f7d8bbbe5295f0294a 100644 (file)
--- 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 43dc232a6d65ab8eba4d45c5c13e843a6121a4bc..fdda9b5af3cc5cebfda58152f5a4318746379b09 100644 (file)
--- 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 2e2b9e899a570e1e6339ae531c104b8693ef46d5..ab1ada8e356c2e68471c3845b97cbaa6caf1cd4e 100644 (file)
--- 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",