From 2660aa7b02e761190fbb552f07343fa3be3a7f41 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 29 Apr 2011 11:43:35 +1000 Subject: [PATCH] s3-smb Use FILE_ATTRIBUTE_HIDDEN intead of aHIDDEN This means we use just one constant for this file attribute. Andrew Bartlett (cherry picked from commit 317e19aeb3fbdb21573b6ef1bc8c2af646a7e61e) (cherry picked from commit a0071e39d67411d578e34a7d03dff9906ff5ea94) --- source3/client/client.c | 14 +-- source3/client/clitar.c | 6 +- source3/include/smb.h | 1 - source3/include/smb_macros.h | 2 +- source3/lib/util.c | 2 +- source3/libgpo/gpo_filesync.c | 2 +- source3/libsmb/clifile.c | 6 +- source3/libsmb/libsmb_dir.c | 10 +- source3/smbd/dir.c | 6 +- source3/smbd/dosmode.c | 26 +++--- source3/smbd/nttrans.c | 2 +- source3/smbd/reply.c | 6 +- source3/smbd/smb2_find.c | 2 +- source3/torture/denytest.c | 8 +- source3/torture/locktest.c | 2 +- source3/torture/locktest2.c | 2 +- source3/torture/mangle_test.c | 10 +- source3/torture/masktest.c | 10 +- source3/torture/nbio.c | 2 +- source3/torture/scanner.c | 4 +- source3/torture/torture.c | 208 +++++++++++++++++++++--------------------- source3/torture/utable.c | 8 +- source3/utils/net_rpc.c | 2 +- 23 files changed, 170 insertions(+), 171 deletions(-) diff --git a/source3/client/client.c b/source3/client/client.c index a12f8a29653..7269f206f5c 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -924,7 +924,7 @@ NTSTATUS do_list(const char *mask, static int cmd_dir(void) { TALLOC_CTX *ctx = talloc_tos(); - uint16 attribute = aDIR | aSYSTEM | aHIDDEN; + uint16 attribute = aDIR | aSYSTEM | FILE_ATTRIBUTE_HIDDEN; char *mask = NULL; char *buf = NULL; int rc = 1; @@ -974,7 +974,7 @@ static int cmd_dir(void) static int cmd_du(void) { TALLOC_CTX *ctx = talloc_tos(); - uint16 attribute = aDIR | aSYSTEM | aHIDDEN; + uint16 attribute = aDIR | aSYSTEM | FILE_ATTRIBUTE_HIDDEN; char *mask = NULL; char *buf = NULL; NTSTATUS status; @@ -1306,7 +1306,7 @@ static NTSTATUS do_mget(struct cli_state *cli_state, struct file_info *finfo, return NT_STATUS_NO_MEMORY; } - status = do_list(mget_mask, aSYSTEM | aHIDDEN | aDIR,do_mget,false, true); + status = do_list(mget_mask, aSYSTEM | FILE_ATTRIBUTE_HIDDEN | aDIR,do_mget,false, true); if (!NT_STATUS_IS_OK(status)) { return status; } @@ -1395,7 +1395,7 @@ static int cmd_more(void) static int cmd_mget(void) { TALLOC_CTX *ctx = talloc_tos(); - uint16 attribute = aSYSTEM | aHIDDEN; + uint16 attribute = aSYSTEM | FILE_ATTRIBUTE_HIDDEN; char *mget_mask = NULL; char *buf = NULL; NTSTATUS status = NT_STATUS_OK; @@ -2311,7 +2311,7 @@ static NTSTATUS do_del(struct cli_state *cli_state, struct file_info *finfo, return NT_STATUS_OK; } - status = cli_unlink(cli_state, mask, aSYSTEM | aHIDDEN); + status = cli_unlink(cli_state, mask, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(status)) { d_printf("%s deleting remote file %s\n", nt_errstr(status), mask); @@ -2330,7 +2330,7 @@ static int cmd_del(void) char *mask = NULL; char *buf = NULL; NTSTATUS status = NT_STATUS_OK; - uint16 attribute = aSYSTEM | aHIDDEN; + uint16 attribute = aSYSTEM | FILE_ATTRIBUTE_HIDDEN; if (recurse) { attribute |= aDIR; @@ -4629,7 +4629,7 @@ static char **remote_completion(const char *text, int len) if (!cli_resolve_path(ctx, "", auth_info, cli, dirmask, &targetcli, &targetpath)) { goto cleanup; } - status = cli_list(targetcli, targetpath, aDIR | aSYSTEM | aHIDDEN, + status = cli_list(targetcli, targetpath, aDIR | aSYSTEM | FILE_ATTRIBUTE_HIDDEN, completion_remote_filter, (void *)&info); if (!NT_STATUS_IS_OK(status)) { goto cleanup; diff --git a/source3/client/clitar.c b/source3/client/clitar.c index c29c084cce5..eba9915e2a5 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -70,7 +70,7 @@ extern struct cli_state *cli; #define ATTRSET 1 #define ATTRRESET 0 -static uint16 attribute = aDIR | aSYSTEM | aHIDDEN; +static uint16 attribute = aDIR | aSYSTEM | FILE_ATTRIBUTE_HIDDEN; #ifndef CLIENT_TIMEOUT #define CLIENT_TIMEOUT (30*1000) @@ -692,7 +692,7 @@ static NTSTATUS do_atar(const char *rname_in, char *lname, } else if (!tar_system && (finfo.mode & aSYSTEM)) { DEBUG(4, ("skipping %s - system bit is set\n", finfo.name)); shallitime=0; - } else if (!tar_hidden && (finfo.mode & aHIDDEN)) { + } else if (!tar_hidden && (finfo.mode & FILE_ATTRIBUTE_HIDDEN)) { DEBUG(4, ("skipping %s - hidden bit is set\n", finfo.name)); shallitime=0; } else { @@ -1408,7 +1408,7 @@ int cmd_setmode(void) attra[direct]|=FILE_ATTRIBUTE_READONLY; break; case 'h': - attra[direct]|=aHIDDEN; + attra[direct]|=FILE_ATTRIBUTE_HIDDEN; break; case 's': attra[direct]|=aSYSTEM; diff --git a/source3/include/smb.h b/source3/include/smb.h index ec408fdb8fc..ed0687b90d6 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -84,7 +84,6 @@ enum smb_read_errors { #define DIR_STRUCT_SIZE 43 /* these define the attribute byte as seen by DOS */ -#define aHIDDEN (1L<<1) /* 0x02 */ #define aSYSTEM (1L<<2) /* 0x04 */ #define aVOLID (1L<<3) /* 0x08 */ #define aDIR (1L<<4) /* 0x10 */ diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index db8450175f5..033159708e4 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -32,7 +32,7 @@ #define IS_DOS_DIR(test_mode) (((test_mode) & aDIR) != 0) #define IS_DOS_ARCHIVE(test_mode) (((test_mode) & aARCH) != 0) #define IS_DOS_SYSTEM(test_mode) (((test_mode) & aSYSTEM) != 0) -#define IS_DOS_HIDDEN(test_mode) (((test_mode) & aHIDDEN) != 0) +#define IS_DOS_HIDDEN(test_mode) (((test_mode) & FILE_ATTRIBUTE_HIDDEN) != 0) #define SMB_WARN(condition, message) \ ((condition) ? (void)0 : \ diff --git a/source3/lib/util.c b/source3/lib/util.c index 1684b340f07..f51e7381b84 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -311,7 +311,7 @@ char *attrib_string(uint16 mode) if (mode & aVOLID) fstrcat(attrstr,"V"); if (mode & aDIR) fstrcat(attrstr,"D"); if (mode & aARCH) fstrcat(attrstr,"A"); - if (mode & aHIDDEN) fstrcat(attrstr,"H"); + if (mode & FILE_ATTRIBUTE_HIDDEN) fstrcat(attrstr,"H"); if (mode & aSYSTEM) fstrcat(attrstr,"S"); if (mode & FILE_ATTRIBUTE_READONLY) fstrcat(attrstr,"R"); diff --git a/source3/libgpo/gpo_filesync.c b/source3/libgpo/gpo_filesync.c index be964a201e4..b4a976840e0 100644 --- a/source3/libgpo/gpo_filesync.c +++ b/source3/libgpo/gpo_filesync.c @@ -228,7 +228,7 @@ NTSTATUS gpo_sync_directories(TALLOC_CTX *mem_ctx, ctx.cli = cli; ctx.remote_path = CONST_DISCARD(char *, nt_path); ctx.local_path = CONST_DISCARD(char *, local_path); - ctx.attribute = (aSYSTEM | aHIDDEN | aDIR); + ctx.attribute = (aSYSTEM | FILE_ATTRIBUTE_HIDDEN | aDIR); ctx.mask = talloc_asprintf(mem_ctx, "%s\\*", diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index 6f1346e8779..553703259ff 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -1136,7 +1136,7 @@ struct tevent_req *cli_rename_send(TALLOC_CTX *mem_ctx, return NULL; } - SSVAL(state->vwv+0, 0, aSYSTEM | aHIDDEN | aDIR); + SSVAL(state->vwv+0, 0, aSYSTEM | FILE_ATTRIBUTE_HIDDEN | aDIR); bytes = talloc_array(state, uint8_t, 1); if (tevent_req_nomem(bytes, req)) { @@ -1261,7 +1261,7 @@ static struct tevent_req *cli_ntrename_internal_send(TALLOC_CTX *mem_ctx, return NULL; } - SSVAL(state->vwv+0, 0 ,aSYSTEM | aHIDDEN | aDIR); + SSVAL(state->vwv+0, 0 ,aSYSTEM | FILE_ATTRIBUTE_HIDDEN | aDIR); SSVAL(state->vwv+1, 0, rename_flag); bytes = talloc_array(state, uint8_t, 1); @@ -2117,7 +2117,7 @@ struct tevent_req *cli_open_create(TALLOC_CTX *mem_ctx, SSVAL(state->vwv + 1, 0, 0); SSVAL(state->vwv + 2, 0, 0); /* no additional info */ SSVAL(state->vwv + 3, 0, accessmode); - SSVAL(state->vwv + 4, 0, aSYSTEM | aHIDDEN); + SSVAL(state->vwv + 4, 0, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); SSVAL(state->vwv + 5, 0, 0); SIVAL(state->vwv + 6, 0, 0); SSVAL(state->vwv + 8, 0, openfn); diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c index 125bd4e2ef1..abca6bccdbf 100644 --- a/source3/libsmb/libsmb_dir.c +++ b/source3/libsmb/libsmb_dir.c @@ -816,7 +816,7 @@ SMBC_opendir_ctx(SMBCCTX *context, } status = cli_list(targetcli, targetpath, - aDIR | aSYSTEM | aHIDDEN, + aDIR | aSYSTEM | FILE_ATTRIBUTE_HIDDEN, dir_list_fn, (void *)dir); if (!NT_STATUS_IS_OK(status)) { if (dir) { @@ -1345,7 +1345,7 @@ SMBC_rmdir_ctx(SMBCCTX *context, } status = cli_list(targetcli, lpath, - aDIR | aSYSTEM | aHIDDEN, + aDIR | aSYSTEM | FILE_ATTRIBUTE_HIDDEN, rmdir_list_fn, &smbc_rmdir_dirempty); @@ -1614,7 +1614,7 @@ SMBC_chmod_ctx(SMBCCTX *context, if (!(newmode & (S_IWUSR | S_IWGRP | S_IWOTH))) mode |= FILE_ATTRIBUTE_READONLY; if ((newmode & S_IXUSR) && lp_map_archive(-1)) mode |= aARCH; if ((newmode & S_IXGRP) && lp_map_system(-1)) mode |= aSYSTEM; - if ((newmode & S_IXOTH) && lp_map_hidden(-1)) mode |= aHIDDEN; + if ((newmode & S_IXOTH) && lp_map_hidden(-1)) mode |= FILE_ATTRIBUTE_HIDDEN; if (!NT_STATUS_IS_OK(cli_setatr(targetcli, targetpath, mode, 0))) { errno = SMBC_errno(context, targetcli); @@ -1803,7 +1803,7 @@ SMBC_unlink_ctx(SMBCCTX *context, } /*d_printf(">>>unlink: resolved path as %s\n", targetpath);*/ - if (!NT_STATUS_IS_OK(cli_unlink(targetcli, targetpath, aSYSTEM | aHIDDEN))) { + if (!NT_STATUS_IS_OK(cli_unlink(targetcli, targetpath, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { errno = SMBC_errno(context, targetcli); @@ -2009,7 +2009,7 @@ SMBC_rename_ctx(SMBCCTX *ocontext, int eno = SMBC_errno(ocontext, targetcli1); if (eno != EEXIST || - !NT_STATUS_IS_OK(cli_unlink(targetcli1, targetpath2, aSYSTEM | aHIDDEN)) || + !NT_STATUS_IS_OK(cli_unlink(targetcli1, targetpath2, aSYSTEM | FILE_ATTRIBUTE_HIDDEN)) || !NT_STATUS_IS_OK(cli_rename(targetcli1, targetpath1, targetpath2))) { errno = eno; diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 78b16ba468e..81391d0daa0 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -872,15 +872,15 @@ bool dir_check_ftype(connection_struct *conn, uint32 mode, uint32 dirtype) uint32 mask; /* Check the "may have" search bits. */ - if (((mode & ~dirtype) & (aHIDDEN | aSYSTEM | aDIR)) != 0) + if (((mode & ~dirtype) & (FILE_ATTRIBUTE_HIDDEN | aSYSTEM | aDIR)) != 0) return False; /* Check the "must have" bits, which are the may have bits shifted eight */ /* If must have bit is set, the file/dir can not be returned in search unless the matching file attribute is set */ - mask = ((dirtype >> 8) & (aDIR|aARCH|FILE_ATTRIBUTE_READONLY|aHIDDEN|aSYSTEM)); /* & 0x37 */ + mask = ((dirtype >> 8) & (aDIR|aARCH|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN|aSYSTEM)); /* & 0x37 */ if(mask) { - if((mask & (mode & (aDIR|aARCH|FILE_ATTRIBUTE_READONLY|aHIDDEN|aSYSTEM))) == mask) /* check if matching attribute present */ + if((mask & (mode & (aDIR|aARCH|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN|aSYSTEM))) == mask) /* check if matching attribute present */ return True; else return False; diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c index d20d77227a9..89328709894 100644 --- a/source3/smbd/dosmode.c +++ b/source3/smbd/dosmode.c @@ -189,7 +189,7 @@ static uint32 dos_mode_from_sbuf(connection_struct *conn, result |= aSYSTEM; if (MAP_HIDDEN(conn) && ((smb_fname->st.st_ex_mode & S_IXOTH) != 0)) - result |= aHIDDEN; + result |= FILE_ATTRIBUTE_HIDDEN; if (S_ISDIR(smb_fname->st.st_ex_mode)) result = aDIR | (result & FILE_ATTRIBUTE_READONLY); @@ -198,7 +198,7 @@ static uint32 dos_mode_from_sbuf(connection_struct *conn, DEBUG(8,("dos_mode_from_sbuf returning ")); - if (result & aHIDDEN) DEBUG(8, ("h")); + if (result & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h")); if (result & FILE_ATTRIBUTE_READONLY ) DEBUG(8, ("r")); if (result & aSYSTEM) DEBUG(8, ("s")); if (result & aDIR ) DEBUG(8, ("d")); @@ -325,7 +325,7 @@ static bool get_ea_dos_attribute(connection_struct *conn, DEBUG(8,("get_ea_dos_attribute returning (0x%x)", dosattr)); - if (dosattr & aHIDDEN) DEBUG(8, ("h")); + if (dosattr & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h")); if (dosattr & FILE_ATTRIBUTE_READONLY ) DEBUG(8, ("r")); if (dosattr & aSYSTEM) DEBUG(8, ("s")); if (dosattr & aDIR ) DEBUG(8, ("d")); @@ -465,7 +465,7 @@ uint32 dos_mode_msdfs(connection_struct *conn, /* Only . and .. are not hidden. */ if (p[0] == '.' && !((p[1] == '\0') || (p[1] == '.' && p[2] == '\0'))) { - result |= aHIDDEN; + result |= FILE_ATTRIBUTE_HIDDEN; } } @@ -473,9 +473,9 @@ uint32 dos_mode_msdfs(connection_struct *conn, /* Optimization : Only call is_hidden_path if it's not already hidden. */ - if (!(result & aHIDDEN) && + if (!(result & FILE_ATTRIBUTE_HIDDEN) && IS_HIDDEN_PATH(conn, smb_fname->base_name)) { - result |= aHIDDEN; + result |= FILE_ATTRIBUTE_HIDDEN; } if (result == 0) { @@ -486,7 +486,7 @@ uint32 dos_mode_msdfs(connection_struct *conn, DEBUG(8,("dos_mode_msdfs returning ")); - if (result & aHIDDEN) DEBUG(8, ("h")); + if (result & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h")); if (result & FILE_ATTRIBUTE_READONLY ) DEBUG(8, ("r")); if (result & aSYSTEM) DEBUG(8, ("s")); if (result & aDIR ) DEBUG(8, ("d")); @@ -509,7 +509,7 @@ int dos_attributes_to_stat_dos_flags(uint32_t dosmode) if (dosmode & aARCH) dos_stat_flags |= UF_DOS_ARCHIVE; - if (dosmode & aHIDDEN) + if (dosmode & FILE_ATTRIBUTE_HIDDEN) dos_stat_flags |= UF_DOS_HIDDEN; if (dosmode & FILE_ATTRIBUTE_READONLY) dos_stat_flags |= UF_DOS_RO; @@ -542,7 +542,7 @@ static bool get_stat_dos_flags(connection_struct *conn, if (smb_fname->st.st_ex_flags & UF_DOS_ARCHIVE) *dosmode |= aARCH; if (smb_fname->st.st_ex_flags & UF_DOS_HIDDEN) - *dosmode |= aHIDDEN; + *dosmode |= FILE_ATTRIBUTE_HIDDEN; if (smb_fname->st.st_ex_flags & UF_DOS_RO) *dosmode |= FILE_ATTRIBUTE_READONLY; if (smb_fname->st.st_ex_flags & UF_DOS_SYSTEM) @@ -637,7 +637,7 @@ uint32 dos_mode(connection_struct *conn, struct smb_filename *smb_fname) /* Only . and .. are not hidden. */ if (p[0] == '.' && !((p[1] == '\0') || (p[1] == '.' && p[2] == '\0'))) { - result |= aHIDDEN; + result |= FILE_ATTRIBUTE_HIDDEN; } } @@ -658,9 +658,9 @@ uint32 dos_mode(connection_struct *conn, struct smb_filename *smb_fname) /* Optimization : Only call is_hidden_path if it's not already hidden. */ - if (!(result & aHIDDEN) && + if (!(result & FILE_ATTRIBUTE_HIDDEN) && IS_HIDDEN_PATH(conn, smb_fname->base_name)) { - result |= aHIDDEN; + result |= FILE_ATTRIBUTE_HIDDEN; } if (result == 0) { @@ -671,7 +671,7 @@ uint32 dos_mode(connection_struct *conn, struct smb_filename *smb_fname) DEBUG(8,("dos_mode returning ")); - if (result & aHIDDEN) DEBUG(8, ("h")); + if (result & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h")); if (result & FILE_ATTRIBUTE_READONLY ) DEBUG(8, ("r")); if (result & aSYSTEM) DEBUG(8, ("s")); if (result & aDIR ) DEBUG(8, ("d")); diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index b34ef5fc3f0..e9bbea8c37b 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -1363,7 +1363,7 @@ static NTSTATUS copy_internals(TALLOC_CTX *ctx, /* Ensure attributes match. */ fattr = dos_mode(conn, smb_fname_src); - if ((fattr & ~attrs) & (aHIDDEN | aSYSTEM)) { + if ((fattr & ~attrs) & (FILE_ATTRIBUTE_HIDDEN | aSYSTEM)) { status = NT_STATUS_NO_SUCH_FILE; goto out; } diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 8dba6be9435..6b6030d294f 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1108,7 +1108,7 @@ void reply_getatr(struct smb_request *req) /* dos smetimes asks for a stat of "" - it returns a "hidden directory" under WfWg - weird! */ if (*fname == '\0') { - mode = aHIDDEN | aDIR; + mode = FILE_ATTRIBUTE_HIDDEN | aDIR; if (!CAN_WRITE(conn)) { mode |= FILE_ATTRIBUTE_READONLY; } @@ -2388,7 +2388,7 @@ static NTSTATUS can_rename(connection_struct *conn, files_struct *fsp, } fmode = dos_mode(conn, fsp->fsp_name); - if ((fmode & ~dirtype) & (aHIDDEN | aSYSTEM)) { + if ((fmode & ~dirtype) & (FILE_ATTRIBUTE_HIDDEN | aSYSTEM)) { return NT_STATUS_NO_SUCH_FILE; } @@ -2452,7 +2452,7 @@ static NTSTATUS do_unlink(connection_struct *conn, dirtype = aDIR|aARCH|FILE_ATTRIBUTE_READONLY; } - dirtype &= (aDIR|aARCH|FILE_ATTRIBUTE_READONLY|aHIDDEN|aSYSTEM); + dirtype &= (aDIR|aARCH|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN|aSYSTEM); if (!dirtype) { return NT_STATUS_NO_SUCH_FILE; } diff --git a/source3/smbd/smb2_find.c b/source3/smbd/smb2_find.c index 786a79ca1fe..fa42028b2a3 100644 --- a/source3/smbd/smb2_find.c +++ b/source3/smbd/smb2_find.c @@ -229,7 +229,7 @@ static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx, int last_entry_off = 0; int off = 0; uint32_t num = 0; - uint32_t dirtype = aHIDDEN | aSYSTEM | aDIR; + uint32_t dirtype = FILE_ATTRIBUTE_HIDDEN | aSYSTEM | aDIR; bool dont_descend = false; bool ask_sharemode = true; diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c index 63448d44f31..e260a6104b3 100644 --- a/source3/torture/denytest.c +++ b/source3/torture/denytest.c @@ -1421,7 +1421,7 @@ bool torture_denytest1(int dummy) printf("starting denytest1\n"); for (i=0;i<2;i++) { - cli_unlink(cli1, fnames[i], aSYSTEM | aHIDDEN); + cli_unlink(cli1, fnames[i], aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_open(cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE, &fnum1); cli_writeall(cli1, fnum1, 0, (uint8_t *)fnames[i], 0, strlen(fnames[i]), NULL); @@ -1484,7 +1484,7 @@ bool torture_denytest1(int dummy) } for (i=0;i<2;i++) { - cli_unlink(cli1, fnames[i], aSYSTEM | aHIDDEN); + cli_unlink(cli1, fnames[i], aSYSTEM | FILE_ATTRIBUTE_HIDDEN); } if (!torture_close_connection(cli1)) { @@ -1515,7 +1515,7 @@ bool torture_denytest2(int dummy) printf("starting denytest2\n"); for (i=0;i<2;i++) { - cli_unlink(cli1, fnames[i], aSYSTEM | aHIDDEN); + cli_unlink(cli1, fnames[i], aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_open(cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE, &fnum1); cli_writeall(cli1, fnum1, 0, (uint8_t *)fnames[i], 0, strlen(fnames[i]), NULL); @@ -1576,7 +1576,7 @@ bool torture_denytest2(int dummy) } for (i=0;i<2;i++) { - cli_unlink(cli1, fnames[i], aSYSTEM | aHIDDEN); + cli_unlink(cli1, fnames[i], aSYSTEM | FILE_ATTRIBUTE_HIDDEN); } if (!torture_close_connection(cli1)) { diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c index d52a8de4605..13cf7212b96 100644 --- a/source3/torture/locktest.c +++ b/source3/torture/locktest.c @@ -400,7 +400,7 @@ static void close_files(struct cli_state *cli[NSERVERS][NCONNECTIONS], } } for (server=0;server= 2) { while (argc >= 2) { diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c index 49ac4b5cec2..ed1a3aa5f32 100644 --- a/source3/torture/nbio.c +++ b/source3/torture/nbio.c @@ -134,7 +134,7 @@ void nb_setup(struct cli_state *cli) void nb_unlink(const char *fname) { - if (!NT_STATUS_IS_OK(cli_unlink(c, fname, aSYSTEM | aHIDDEN))) { + if (!NT_STATUS_IS_OK(cli_unlink(c, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { #if NBDEBUG printf("(%d) unlink %s failed (%s)\n", line_count, fname, cli_errstr(c)); diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c index c7d3ebc2913..5e06cb5878c 100644 --- a/source3/torture/scanner.c +++ b/source3/torture/scanner.c @@ -172,7 +172,7 @@ static bool scan_trans2(struct cli_state *cli, int op, int level, status = try_trans2_len(cli, "newfile", op, level, param, data, param_len, &data_len, &rparam_len, &rdata_len); - cli_unlink(cli, "\\newfile.dat", aSYSTEM | aHIDDEN); + cli_unlink(cli, "\\newfile.dat", aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_rmdir(cli, "\\newfile.dat"); if (NT_STATUS_IS_OK(status)) return True; @@ -379,7 +379,7 @@ static bool scan_nttrans(struct cli_state *cli, int op, int level, status = try_nttrans_len(cli, "newfile", op, level, param, data, param_len, &data_len, &rparam_len, &rdata_len); - cli_unlink(cli, "\\newfile.dat", aSYSTEM | aHIDDEN); + cli_unlink(cli, "\\newfile.dat", aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_rmdir(cli, "\\newfile.dat"); if (NT_STATUS_IS_OK(status)) return True; diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 48e3d067f6e..b560040c5e1 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -630,7 +630,7 @@ static bool rw_torture(struct cli_state *c) correct = False; } - if (!NT_STATUS_IS_OK(cli_unlink(c, fname, aSYSTEM | aHIDDEN))) { + if (!NT_STATUS_IS_OK(cli_unlink(c, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { printf("unlink failed (%s)\n", cli_errstr(c)); correct = False; } @@ -642,7 +642,7 @@ static bool rw_torture(struct cli_state *c) } cli_close(c, fnum2); - cli_unlink(c, lockfname, aSYSTEM | aHIDDEN); + cli_unlink(c, lockfname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); printf("%d\n", i); @@ -687,7 +687,7 @@ static bool rw_torture3(struct cli_state *c, char *lockfname) if (procnum == 0) { - if (!NT_STATUS_IS_OK(cli_unlink(c, lockfname, aSYSTEM | aHIDDEN))) { + if (!NT_STATUS_IS_OK(cli_unlink(c, lockfname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { printf("unlink failed (%s) (normal, this file should not exist)\n", cli_errstr(c)); } @@ -787,7 +787,7 @@ static bool rw_torture2(struct cli_state *c1, struct cli_state *c2) bool correct = True; ssize_t bytes_read; - if (!NT_STATUS_IS_OK(cli_unlink(c1, lockfname, aSYSTEM | aHIDDEN))) { + if (!NT_STATUS_IS_OK(cli_unlink(c1, lockfname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { printf("unlink failed (%s) (normal, this file should not exist)\n", cli_errstr(c1)); } @@ -848,7 +848,7 @@ static bool rw_torture2(struct cli_state *c1, struct cli_state *c2) correct = False; } - if (!NT_STATUS_IS_OK(cli_unlink(c1, lockfname, aSYSTEM | aHIDDEN))) { + if (!NT_STATUS_IS_OK(cli_unlink(c1, lockfname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { printf("unlink failed (%s)\n", cli_errstr(c1)); correct = False; } @@ -934,7 +934,7 @@ static bool run_readwritelarge_internal(int max_xmit_k) printf("starting readwritelarge_internal\n"); - cli_unlink(cli1, lockfname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, lockfname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_open(cli1, lockfname, O_RDWR | O_CREAT | O_EXCL, DENY_NONE, &fnum1))) { printf("open read/write of %s failed (%s)\n", lockfname, cli_errstr(cli1)); @@ -964,7 +964,7 @@ static bool run_readwritelarge_internal(int max_xmit_k) correct = False; } - if (!NT_STATUS_IS_OK(cli_unlink(cli1, lockfname, aSYSTEM | aHIDDEN))) { + if (!NT_STATUS_IS_OK(cli_unlink(cli1, lockfname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { printf("unlink failed (%s)\n", cli_errstr(cli1)); correct = False; } @@ -1181,7 +1181,7 @@ static bool run_locktest1(int dummy) printf("starting locktest1\n"); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) { printf("open of %s failed (%s)\n", fname, cli_errstr(cli1)); @@ -1253,7 +1253,7 @@ static bool run_locktest1(int dummy) return False; } - if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | aHIDDEN))) { + if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { printf("unlink failed (%s)\n", cli_errstr(cli1)); return False; } @@ -1295,7 +1295,7 @@ static bool run_tcon_test(int dummy) printf("starting tcontest\n"); - cli_unlink(cli, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) { printf("open of %s failed (%s)\n", fname, cli_errstr(cli)); @@ -1562,7 +1562,7 @@ static bool run_locktest2(int dummy) printf("starting locktest2\n"); - cli_unlink(cli, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_setpid(cli, 1); @@ -1699,7 +1699,7 @@ static bool run_locktest3(int dummy) printf("starting locktest3\n"); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) { printf("open of %s failed (%s)\n", fname, cli_errstr(cli1)); @@ -1779,7 +1779,7 @@ static bool run_locktest3(int dummy) return False; } - if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | aHIDDEN))) { + if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { printf("unlink failed (%s)\n", cli_errstr(cli1)); return False; } @@ -1823,7 +1823,7 @@ static bool run_locktest4(int dummy) printf("starting locktest4\n"); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1); cli_open(cli2, fname, O_RDWR, DENY_NONE, &fnum2); @@ -1975,7 +1975,7 @@ static bool run_locktest4(int dummy) fail: cli_close(cli1, fnum1); cli_close(cli2, fnum2); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); torture_close_connection(cli1); torture_close_connection(cli2); @@ -2005,7 +2005,7 @@ static bool run_locktest5(int dummy) printf("starting locktest5\n"); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1); cli_open(cli2, fname, O_RDWR, DENY_NONE, &fnum2); @@ -2097,7 +2097,7 @@ static bool run_locktest5(int dummy) fail: cli_close(cli1, fnum1); cli_close(cli2, fnum2); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!torture_close_connection(cli1)) { correct = False; } @@ -2132,7 +2132,7 @@ static bool run_locktest6(int dummy) for (i=0;i<1;i++) { printf("Testing %s\n", fname[i]); - cli_unlink(cli, fname[i], aSYSTEM | aHIDDEN); + cli_unlink(cli, fname[i], aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_open(cli, fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum); status = cli_locktype(cli, fnum, 0, 8, 0, LOCKING_ANDX_CHANGE_LOCKTYPE); @@ -2144,7 +2144,7 @@ static bool run_locktest6(int dummy) cli_close(cli, fnum); printf("CANCEL_LOCK gave %s\n", nt_errstr(status)); - cli_unlink(cli, fname[i], aSYSTEM | aHIDDEN); + cli_unlink(cli, fname[i], aSYSTEM | FILE_ATTRIBUTE_HIDDEN); } torture_close_connection(cli); @@ -2170,7 +2170,7 @@ static bool run_locktest7(int dummy) printf("starting locktest7\n"); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1); @@ -2290,7 +2290,7 @@ static bool run_locktest7(int dummy) fail: cli_close(cli1, fnum1); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); torture_close_connection(cli1); printf("finished locktest7\n"); @@ -2322,7 +2322,7 @@ static bool run_locktest8(int dummy) printf("starting locktest8\n"); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); status = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_WRITE, &fnum1); @@ -2364,7 +2364,7 @@ static bool run_locktest8(int dummy) fail: cli_close(cli1, fnum1); cli_close(cli1, fnum2); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); torture_close_connection(cli1); printf("finished locktest8\n"); @@ -2594,7 +2594,7 @@ static bool run_fdpasstest(int dummy) printf("starting fdpasstest\n"); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) { printf("open of %s failed (%s)\n", fname, cli_errstr(cli1)); @@ -2619,7 +2619,7 @@ static bool run_fdpasstest(int dummy) } cli_close(cli1, fnum1); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); torture_close_connection(cli1); torture_close_connection(cli2); @@ -2658,8 +2658,8 @@ static bool run_fdsesstest(int dummy) printf("starting fdsesstest\n"); - cli_unlink(cli, fname, aSYSTEM | aHIDDEN); - cli_unlink(cli, fname1, aSYSTEM | aHIDDEN); + cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); + cli_unlink(cli, fname1, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) { printf("open of %s failed (%s)\n", fname, cli_errstr(cli)); @@ -2685,7 +2685,7 @@ static bool run_fdsesstest(int dummy) if (NT_STATUS_IS_OK(cli_open(cli, fname1, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum2))) { printf("create with different vuid, same cnum succeeded.\n"); cli_close(cli, fnum2); - cli_unlink(cli, fname1, aSYSTEM | aHIDDEN); + cli_unlink(cli, fname1, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); } else { printf("create with different vuid, same cnum failed.\n"); printf("This will cause problems with service clients.\n"); @@ -2705,7 +2705,7 @@ static bool run_fdsesstest(int dummy) cli->cnum = saved_cnum; cli_close(cli, fnum1); - cli_unlink(cli, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); torture_close_connection(cli); @@ -2733,7 +2733,7 @@ static bool run_unlinktest(int dummy) printf("starting unlink test\n"); - cli_unlink(cli, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_setpid(cli, 1); @@ -2742,7 +2742,7 @@ static bool run_unlinktest(int dummy) return False; } - if (NT_STATUS_IS_OK(cli_unlink(cli, fname, aSYSTEM | aHIDDEN))) { + if (NT_STATUS_IS_OK(cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { printf("error: server allowed unlink on an open file\n"); correct = False; } else { @@ -2751,7 +2751,7 @@ static bool run_unlinktest(int dummy) } cli_close(cli, fnum); - cli_unlink(cli, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!torture_close_connection(cli)) { correct = False; @@ -2803,7 +2803,7 @@ static bool run_maxfidtest(int dummy) for (;i>=0;i--) { slprintf(fname,sizeof(fname)-1,ftemplate, i,(int)getpid()); cli_close(cli, fnums[i]); - if (!NT_STATUS_IS_OK(cli_unlink(cli, fname, aSYSTEM | aHIDDEN))) { + if (!NT_STATUS_IS_OK(cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { printf("unlink of %s failed (%s)\n", fname, cli_errstr(cli)); correct = False; @@ -2999,7 +2999,7 @@ static bool run_attrtest(int dummy) return False; } - cli_unlink(cli, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_open(cli, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum); cli_close(cli, fnum); @@ -3034,7 +3034,7 @@ static bool run_attrtest(int dummy) correct = True; } - cli_unlink(cli, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!torture_close_connection(cli)) { correct = False; @@ -3077,7 +3077,7 @@ static bool run_trans2test(int dummy) correct = false; } - cli_unlink(cli, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_open(cli, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum); if (!NT_STATUS_IS_OK(cli_qfileinfo_basic( @@ -3103,7 +3103,7 @@ static bool run_trans2test(int dummy) sleep(2); - cli_unlink(cli, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_open(cli, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum))) { printf("open of %s failed (%s)\n", fname, cli_errstr(cli)); @@ -3135,7 +3135,7 @@ static bool run_trans2test(int dummy) } - cli_unlink(cli, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_open(cli, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum); cli_close(cli, fnum); @@ -3152,7 +3152,7 @@ static bool run_trans2test(int dummy) } } - cli_unlink(cli, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); /* check if the server updates the directory modification time @@ -3185,7 +3185,7 @@ static bool run_trans2test(int dummy) correct = False; } } - cli_unlink(cli, fname2, aSYSTEM | aHIDDEN); + cli_unlink(cli, fname2, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_rmdir(cli, dname); if (!torture_close_connection(cli)) { @@ -3270,7 +3270,7 @@ static bool run_oplock1(int dummy) return False; } - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_sockopt(cli1, sockops); @@ -3283,15 +3283,15 @@ static bool run_oplock1(int dummy) cli1->use_oplocks = False; - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) { printf("close2 failed (%s)\n", cli_errstr(cli1)); return False; } - if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | aHIDDEN))) { + if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { printf("unlink failed (%s)\n", cli_errstr(cli1)); return False; } @@ -3341,7 +3341,7 @@ static bool run_oplock2(int dummy) cli2->use_oplocks = True; cli2->use_level_II_oplocks = True; - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_sockopt(cli1, sockops); cli_sockopt(cli2, sockops); @@ -3413,7 +3413,7 @@ static bool run_oplock2(int dummy) sleep(4); - if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | aHIDDEN))) { + if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { printf("unlink failed (%s)\n", cli_errstr(cli1)); correct = False; } @@ -3527,8 +3527,8 @@ static bool run_oplock4(int dummy) return false; } - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); - cli_unlink(cli1, fname_ln, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); + cli_unlink(cli1, fname_ln, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_sockopt(cli1, sockops); cli_sockopt(cli2, sockops); @@ -3612,11 +3612,11 @@ static bool run_oplock4(int dummy) correct = false; } - if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | aHIDDEN))) { + if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { printf("unlink failed (%s)\n", cli_errstr(cli1)); correct = false; } - if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname_ln, aSYSTEM | aHIDDEN))) { + if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname_ln, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { printf("unlink failed (%s)\n", cli_errstr(cli1)); correct = false; } @@ -3658,7 +3658,7 @@ static bool run_deletetest(int dummy) /* Test 1 - this should delete the file on close. */ cli_setatr(cli1, fname, 0, 0); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_ALL_ACCESS|DELETE_ACCESS, FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF, @@ -3685,7 +3685,7 @@ static bool run_deletetest(int dummy) /* Test 2 - this should delete the file on close. */ cli_setatr(cli1, fname, 0, 0); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, @@ -3714,13 +3714,13 @@ static bool run_deletetest(int dummy) correct = False; goto fail; } - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); } else printf("second delete on close test succeeded.\n"); /* Test 3 - ... */ cli_setatr(cli1, fname, 0, 0); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) { @@ -3773,7 +3773,7 @@ static bool run_deletetest(int dummy) if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) { printf("[3] close failed (%s)\n", cli_errstr(cli1)); } - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); correct = False; goto fail; } else @@ -3781,7 +3781,7 @@ static bool run_deletetest(int dummy) /* Test 4 ... */ cli_setatr(cli1, fname, 0, 0); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) { @@ -3828,7 +3828,7 @@ static bool run_deletetest(int dummy) /* Test 5 ... */ cli_setatr(cli1, fname, 0, 0); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT, DENY_NONE, &fnum1))) { printf("[5] open of %s failed (%s)\n", fname, cli_errstr(cli1)); @@ -3854,7 +3854,7 @@ static bool run_deletetest(int dummy) /* Test 6 ... */ cli_setatr(cli1, fname, 0, 0); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, @@ -3882,7 +3882,7 @@ static bool run_deletetest(int dummy) /* Test 7 ... */ cli_setatr(cli1, fname, 0, 0); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS, FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF, 0, 0, &fnum1))) { @@ -3927,7 +3927,7 @@ static bool run_deletetest(int dummy) /* Test 7 ... */ cli_setatr(cli1, fname, 0, 0); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!torture_open_connection(&cli2, 1)) { printf("[8] failed to open second connection.\n"); @@ -4012,7 +4012,7 @@ static bool run_deletetest(int dummy) printf("tenth delete on close test succeeded.\n"); cli_setatr(cli1, fname, 0, 0); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); /* What error do we get when attempting to open a read-only file with delete access ? */ @@ -4060,7 +4060,7 @@ static bool run_deletetest(int dummy) if (fnum1 != (uint16_t)-1) cli_close(cli1, fnum1); if (fnum2 != (uint16_t)-1) cli_close(cli1, fnum2); cli_setatr(cli1, fname, 0, 0); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (cli1 && !torture_close_connection(cli1)) { correct = False; @@ -4088,8 +4088,8 @@ static bool run_deletetest_ln(int dummy) return false; } - cli_unlink(cli, fname, aSYSTEM | aHIDDEN); - cli_unlink(cli, fname_ln, aSYSTEM | aHIDDEN); + cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); + cli_unlink(cli, fname_ln, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_sockopt(cli, sockops); @@ -4170,8 +4170,8 @@ static bool run_deletetest_ln(int dummy) correct = False; } - cli_unlink(cli, fname, aSYSTEM | aHIDDEN); - cli_unlink(cli, fname_ln, aSYSTEM | aHIDDEN); + cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); + cli_unlink(cli, fname_ln, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!torture_close_connection(cli)) { correct = false; @@ -4288,8 +4288,8 @@ static bool run_rename(int dummy) return False; } - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); - cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); + cli_unlink(cli1, fname1, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, FILE_OVERWRITE_IF, 0, 0, &fnum1))) { printf("First open failed - %s\n", cli_errstr(cli1)); @@ -4308,8 +4308,8 @@ static bool run_rename(int dummy) return False; } - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); - cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); + cli_unlink(cli1, fname1, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); status = cli_ntcreate(cli1, fname, 0, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL, #if 0 FILE_SHARE_DELETE|FILE_SHARE_NONE, @@ -4334,8 +4334,8 @@ static bool run_rename(int dummy) return False; } - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); - cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); + cli_unlink(cli1, fname1, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, READ_CONTROL_ACCESS, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) { @@ -4377,8 +4377,8 @@ static bool run_rename(int dummy) return False; } - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); - cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); + cli_unlink(cli1, fname1, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); /*----*/ @@ -4400,8 +4400,8 @@ static bool run_rename(int dummy) return False; } - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); - cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); + cli_unlink(cli1, fname1, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); /*--*/ @@ -4458,8 +4458,8 @@ static bool run_rename(int dummy) } } - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); - cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); + cli_unlink(cli1, fname1, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!torture_close_connection(cli1)) { correct = False; @@ -4518,7 +4518,7 @@ static bool run_opentest(int dummy) } cli_setatr(cli1, fname, 0, 0); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_sockopt(cli1, sockops); @@ -4576,7 +4576,7 @@ static bool run_opentest(int dummy) return False; } - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); printf("finished open test 2\n"); @@ -4637,7 +4637,7 @@ static bool run_opentest(int dummy) } printf("finished open test 3\n"); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); printf("Do ctemp tests\n"); if (!NT_STATUS_IS_OK(cli_ctemp(cli1, talloc_tos(), "\\", &fnum1, &tmp_path))) { @@ -4648,7 +4648,7 @@ static bool run_opentest(int dummy) if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) { printf("close of temp failed (%s)\n", cli_errstr(cli1)); } - if (!NT_STATUS_IS_OK(cli_unlink(cli1, tmp_path, aSYSTEM | aHIDDEN))) { + if (!NT_STATUS_IS_OK(cli_unlink(cli1, tmp_path, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { printf("unlink of temp failed (%s)\n", cli_errstr(cli1)); } @@ -4659,7 +4659,7 @@ static bool run_opentest(int dummy) } cli_setatr(cli2, fname, 0, 0); - cli_unlink(cli2, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli2, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_sockopt(cli2, sockops); @@ -4688,7 +4688,7 @@ static bool run_opentest(int dummy) printf("non-io open test #1 passed.\n"); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); printf("TEST #2 testing 2 non-io opens (first with delete)\n"); @@ -4715,7 +4715,7 @@ static bool run_opentest(int dummy) printf("non-io open test #2 passed.\n"); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); printf("TEST #3 testing 2 non-io opens (second with delete)\n"); @@ -4742,7 +4742,7 @@ static bool run_opentest(int dummy) printf("non-io open test #3 passed.\n"); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); printf("TEST #4 testing 2 non-io opens (both with delete)\n"); @@ -4767,7 +4767,7 @@ static bool run_opentest(int dummy) printf("non-io open test #4 passed.\n"); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); printf("TEST #5 testing 2 non-io opens (both with delete - both with file share delete)\n"); @@ -4797,7 +4797,7 @@ static bool run_opentest(int dummy) printf("TEST #6 testing 1 non-io open, one io open\n"); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) { @@ -4825,7 +4825,7 @@ static bool run_opentest(int dummy) printf("TEST #7 testing 1 non-io open, one io open with delete\n"); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) { @@ -4848,7 +4848,7 @@ static bool run_opentest(int dummy) printf("non-io open test #7 passed.\n"); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); printf("TEST #8 testing open without WRITE_ATTRIBUTES, updating close write time.\n"); status = cli_ntcreate(cli1, fname, 0, FILE_WRITE_DATA, FILE_ATTRIBUTE_NORMAL, @@ -5221,7 +5221,7 @@ static bool run_openattrtest(int dummy) for (k = 0, i = 0; i < sizeof(open_attrs_table)/sizeof(uint32); i++) { cli_setatr(cli1, fname, 0, 0); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_WRITE_DATA, open_attrs_table[i], FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) { printf("open %d (1) of %s failed (%s)\n", i, fname, cli_errstr(cli1)); @@ -5293,7 +5293,7 @@ static bool run_openattrtest(int dummy) } cli_setatr(cli1, fname, 0, 0); - cli_unlink(cli1, fname, aSYSTEM | aHIDDEN); + cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); printf("open attr test %s.\n", correct ? "passed" : "failed"); @@ -5364,7 +5364,7 @@ static bool run_dirtest(int dummy) for (i=0;i