sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-29 13:49:30 +03:00
Code Activity

s3-smb Use FILE_ATTRIBUTE_SYSTEM intead of aSYSTEM

Browse Source 
This means we use just one constant for this file attribute.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2011-04-29 13:23:14 +10:00
parent 317e19aeb3
commit 0a3c84b554
23 changed files with 160 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source3/client/client.c
View File

@ -924,7 +924,7 @@ NTSTATUS do_list(const char *mask,
static int cmd_dir(void) static int cmd_dir(void)
{ {
TALLOC_CTX *ctx = talloc_tos(); TALLOC_CTX *ctx = talloc_tos();
uint16 attribute = aDIR | aSYSTEM | FILE_ATTRIBUTE_HIDDEN; uint16 attribute = aDIR | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
char *mask = NULL; char *mask = NULL;
char *buf = NULL; char *buf = NULL;
int rc = 1; int rc = 1;
@ -974,7 +974,7 @@ static int cmd_dir(void)
static int cmd_du(void) static int cmd_du(void)
{ {
TALLOC_CTX *ctx = talloc_tos(); TALLOC_CTX *ctx = talloc_tos();
uint16 attribute = aDIR | aSYSTEM | FILE_ATTRIBUTE_HIDDEN; uint16 attribute = aDIR | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
char *mask = NULL; char *mask = NULL;
char *buf = NULL; char *buf = NULL;
NTSTATUS status; NTSTATUS status;
@ -1306,7 +1306,7 @@ static NTSTATUS do_mget(struct cli_state *cli_state, struct file_info *finfo,
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
status = do_list(mget_mask, aSYSTEM | FILE_ATTRIBUTE_HIDDEN | aDIR,do_mget,false, true); status = do_list(mget_mask, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | aDIR,do_mget,false, true);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
return status; return status;
} }
@ -1395,7 +1395,7 @@ static int cmd_more(void)
static int cmd_mget(void) static int cmd_mget(void)
{ {
TALLOC_CTX *ctx = talloc_tos(); TALLOC_CTX *ctx = talloc_tos();
uint16 attribute = aSYSTEM | FILE_ATTRIBUTE_HIDDEN; uint16 attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
char *mget_mask = NULL; char *mget_mask = NULL;
char *buf = NULL; char *buf = NULL;
NTSTATUS status = NT_STATUS_OK; 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; return NT_STATUS_OK;
} }
status = cli_unlink(cli_state, mask, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); status = cli_unlink(cli_state, mask, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
d_printf("%s deleting remote file %s\n", d_printf("%s deleting remote file %s\n",
nt_errstr(status), mask); nt_errstr(status), mask);
@ -2330,7 +2330,7 @@ static int cmd_del(void)
char *mask = NULL; char *mask = NULL;
char *buf = NULL; char *buf = NULL;
NTSTATUS status = NT_STATUS_OK; NTSTATUS status = NT_STATUS_OK;
uint16 attribute = aSYSTEM | FILE_ATTRIBUTE_HIDDEN; uint16 attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
if (recurse) { if (recurse) {
attribute |= aDIR; 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)) { if (!cli_resolve_path(ctx, "", auth_info, cli, dirmask, &targetcli, &targetpath)) {
goto cleanup; goto cleanup;
} }
status = cli_list(targetcli, targetpath, aDIR | aSYSTEM | FILE_ATTRIBUTE_HIDDEN, status = cli_list(targetcli, targetpath, aDIR | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN,
completion_remote_filter, (void *)&info); completion_remote_filter, (void *)&info);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
goto cleanup; goto cleanup;

6
source3/client/clitar.c
View File

@ -70,7 +70,7 @@ extern struct cli_state *cli;
#define ATTRSET 1 #define ATTRSET 1
#define ATTRRESET 0 #define ATTRRESET 0
static uint16 attribute = aDIR | aSYSTEM | FILE_ATTRIBUTE_HIDDEN; static uint16 attribute = aDIR | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
#ifndef CLIENT_TIMEOUT #ifndef CLIENT_TIMEOUT
#define CLIENT_TIMEOUT (30*1000) #define CLIENT_TIMEOUT (30*1000)
@ -689,7 +689,7 @@ static NTSTATUS do_atar(const char *rname_in, char *lname,
if (tar_inc && !(finfo.mode & aARCH)) { if (tar_inc && !(finfo.mode & aARCH)) {
DEBUG(4, ("skipping %s - archive bit not set\n", finfo.name)); DEBUG(4, ("skipping %s - archive bit not set\n", finfo.name));
shallitime=0; shallitime=0;
} else if (!tar_system && (finfo.mode & aSYSTEM)) { } else if (!tar_system && (finfo.mode & FILE_ATTRIBUTE_SYSTEM)) {
DEBUG(4, ("skipping %s - system bit is set\n", finfo.name)); DEBUG(4, ("skipping %s - system bit is set\n", finfo.name));
shallitime=0; shallitime=0;
} else if (!tar_hidden && (finfo.mode & FILE_ATTRIBUTE_HIDDEN)) { } else if (!tar_hidden && (finfo.mode & FILE_ATTRIBUTE_HIDDEN)) {
@ -1411,7 +1411,7 @@ int cmd_setmode(void)
attra[direct]|=FILE_ATTRIBUTE_HIDDEN; attra[direct]|=FILE_ATTRIBUTE_HIDDEN;
break; break;
case 's': case 's':
attra[direct]|=aSYSTEM; attra[direct]|=FILE_ATTRIBUTE_SYSTEM;
break; break;
case 'a': case 'a':
attra[direct]|=aARCH; attra[direct]|=aARCH;

1
source3/include/smb.h
View File

@ -86,7 +86,6 @@ enum smb_read_errors {
#define DIR_STRUCT_SIZE 43 #define DIR_STRUCT_SIZE 43
/* these define the attribute byte as seen by DOS */ /* these define the attribute byte as seen by DOS */
#define aSYSTEM (1L<<2) /* 0x04 */
#define aVOLID (1L<<3) /* 0x08 */ #define aVOLID (1L<<3) /* 0x08 */
#define aDIR (1L<<4) /* 0x10 */ #define aDIR (1L<<4) /* 0x10 */
#define aARCH (1L<<5) /* 0x20 */ #define aARCH (1L<<5) /* 0x20 */

2
source3/include/smb_macros.h
View File

@ -31,7 +31,7 @@
#define IS_DOS_READONLY(test_mode) (((test_mode) & FILE_ATTRIBUTE_READONLY) != 0) #define IS_DOS_READONLY(test_mode) (((test_mode) & FILE_ATTRIBUTE_READONLY) != 0)
#define IS_DOS_DIR(test_mode) (((test_mode) & aDIR) != 0) #define IS_DOS_DIR(test_mode) (((test_mode) & aDIR) != 0)
#define IS_DOS_ARCHIVE(test_mode) (((test_mode) & aARCH) != 0) #define IS_DOS_ARCHIVE(test_mode) (((test_mode) & aARCH) != 0)
#define IS_DOS_SYSTEM(test_mode) (((test_mode) & aSYSTEM) != 0) #define IS_DOS_SYSTEM(test_mode) (((test_mode) & FILE_ATTRIBUTE_SYSTEM) != 0)
#define IS_DOS_HIDDEN(test_mode) (((test_mode) & FILE_ATTRIBUTE_HIDDEN) != 0) #define IS_DOS_HIDDEN(test_mode) (((test_mode) & FILE_ATTRIBUTE_HIDDEN) != 0)
#define SMB_WARN(condition, message) \ #define SMB_WARN(condition, message) \

2
source3/lib/util.c
View File

@ -308,7 +308,7 @@ char *attrib_string(uint16 mode)
if (mode & aDIR) fstrcat(attrstr,"D"); if (mode & aDIR) fstrcat(attrstr,"D");
if (mode & aARCH) fstrcat(attrstr,"A"); if (mode & aARCH) fstrcat(attrstr,"A");
if (mode & FILE_ATTRIBUTE_HIDDEN) fstrcat(attrstr,"H"); if (mode & FILE_ATTRIBUTE_HIDDEN) fstrcat(attrstr,"H");
if (mode & aSYSTEM) fstrcat(attrstr,"S"); if (mode & FILE_ATTRIBUTE_SYSTEM) fstrcat(attrstr,"S");
if (mode & FILE_ATTRIBUTE_READONLY) fstrcat(attrstr,"R"); if (mode & FILE_ATTRIBUTE_READONLY) fstrcat(attrstr,"R");
return talloc_strdup(talloc_tos(), attrstr); return talloc_strdup(talloc_tos(), attrstr);

2
source3/libgpo/gpo_filesync.c
View File

@ -228,7 +228,7 @@ NTSTATUS gpo_sync_directories(TALLOC_CTX *mem_ctx,
ctx.cli = cli; ctx.cli = cli;
ctx.remote_path = CONST_DISCARD(char *, nt_path); ctx.remote_path = CONST_DISCARD(char *, nt_path);
ctx.local_path = CONST_DISCARD(char *, local_path); ctx.local_path = CONST_DISCARD(char *, local_path);
ctx.attribute = (aSYSTEM | FILE_ATTRIBUTE_HIDDEN | aDIR); ctx.attribute = (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | aDIR);
ctx.mask = talloc_asprintf(mem_ctx, ctx.mask = talloc_asprintf(mem_ctx,
"%s\\*", "%s\\*",

6
source3/libsmb/clifile.c
View File

@ -1134,7 +1134,7 @@ struct tevent_req *cli_rename_send(TALLOC_CTX *mem_ctx,
return NULL; return NULL;
} }
SSVAL(state->vwv+0, 0, aSYSTEM | FILE_ATTRIBUTE_HIDDEN | aDIR); SSVAL(state->vwv+0, 0, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | aDIR);
bytes = talloc_array(state, uint8_t, 1); bytes = talloc_array(state, uint8_t, 1);
if (tevent_req_nomem(bytes, req)) { if (tevent_req_nomem(bytes, req)) {
@ -1259,7 +1259,7 @@ static struct tevent_req *cli_ntrename_internal_send(TALLOC_CTX *mem_ctx,
return NULL; return NULL;
} }
SSVAL(state->vwv+0, 0 ,aSYSTEM | FILE_ATTRIBUTE_HIDDEN | aDIR); SSVAL(state->vwv+0, 0 ,FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | aDIR);
SSVAL(state->vwv+1, 0, rename_flag); SSVAL(state->vwv+1, 0, rename_flag);
bytes = talloc_array(state, uint8_t, 1); bytes = talloc_array(state, uint8_t, 1);
@ -2115,7 +2115,7 @@ struct tevent_req *cli_open_create(TALLOC_CTX *mem_ctx,
SSVAL(state->vwv + 1, 0, 0); SSVAL(state->vwv + 1, 0, 0);
SSVAL(state->vwv + 2, 0, 0); /* no additional info */ SSVAL(state->vwv + 2, 0, 0); /* no additional info */
SSVAL(state->vwv + 3, 0, accessmode); SSVAL(state->vwv + 3, 0, accessmode);
SSVAL(state->vwv + 4, 0, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); SSVAL(state->vwv + 4, 0, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
SSVAL(state->vwv + 5, 0, 0); SSVAL(state->vwv + 5, 0, 0);
SIVAL(state->vwv + 6, 0, 0); SIVAL(state->vwv + 6, 0, 0);
SSVAL(state->vwv + 8, 0, openfn); SSVAL(state->vwv + 8, 0, openfn);

10
source3/libsmb/libsmb_dir.c
View File

@ -816,7 +816,7 @@ SMBC_opendir_ctx(SMBCCTX *context,
} }
status = cli_list(targetcli, targetpath, status = cli_list(targetcli, targetpath,
aDIR | aSYSTEM | FILE_ATTRIBUTE_HIDDEN, aDIR | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN,
dir_list_fn, (void *)dir); dir_list_fn, (void *)dir);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
if (dir) { if (dir) {
@ -1345,7 +1345,7 @@ SMBC_rmdir_ctx(SMBCCTX *context,
} }
status = cli_list(targetcli, lpath, status = cli_list(targetcli, lpath,
aDIR | aSYSTEM | FILE_ATTRIBUTE_HIDDEN, aDIR | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN,
rmdir_list_fn, rmdir_list_fn,
&smbc_rmdir_dirempty); &smbc_rmdir_dirempty);
@ -1613,7 +1613,7 @@ SMBC_chmod_ctx(SMBCCTX *context,
if (!(newmode & (S_IWUSR | S_IWGRP | S_IWOTH))) mode |= FILE_ATTRIBUTE_READONLY; 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_IXUSR) && lp_map_archive(-1)) mode |= aARCH;
if ((newmode & S_IXGRP) && lp_map_system(-1)) mode |= aSYSTEM; if ((newmode & S_IXGRP) && lp_map_system(-1)) mode |= FILE_ATTRIBUTE_SYSTEM;
if ((newmode & S_IXOTH) && lp_map_hidden(-1)) mode |= FILE_ATTRIBUTE_HIDDEN; if ((newmode & S_IXOTH) && lp_map_hidden(-1)) mode |= FILE_ATTRIBUTE_HIDDEN;
if (!NT_STATUS_IS_OK(cli_setatr(targetcli, targetpath, mode, 0))) { if (!NT_STATUS_IS_OK(cli_setatr(targetcli, targetpath, mode, 0))) {
@ -1803,7 +1803,7 @@ SMBC_unlink_ctx(SMBCCTX *context,
} }
/*d_printf(">>>unlink: resolved path as %s\n", targetpath);*/ /*d_printf(">>>unlink: resolved path as %s\n", targetpath);*/
if (!NT_STATUS_IS_OK(cli_unlink(targetcli, targetpath, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(targetcli, targetpath, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
errno = SMBC_errno(context, targetcli); errno = SMBC_errno(context, targetcli);
@ -2009,7 +2009,7 @@ SMBC_rename_ctx(SMBCCTX *ocontext,
int eno = SMBC_errno(ocontext, targetcli1); int eno = SMBC_errno(ocontext, targetcli1);
if (eno != EEXIST || if (eno != EEXIST ||
!NT_STATUS_IS_OK(cli_unlink(targetcli1, targetpath2, aSYSTEM | FILE_ATTRIBUTE_HIDDEN)) || !NT_STATUS_IS_OK(cli_unlink(targetcli1, targetpath2, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN)) ||
!NT_STATUS_IS_OK(cli_rename(targetcli1, targetpath1, targetpath2))) { !NT_STATUS_IS_OK(cli_rename(targetcli1, targetpath1, targetpath2))) {
errno = eno; errno = eno;

6
source3/smbd/dir.c
View File

@ -872,15 +872,15 @@ bool dir_check_ftype(connection_struct *conn, uint32 mode, uint32 dirtype)
uint32 mask; uint32 mask;
/* Check the "may have" search bits. */ /* Check the "may have" search bits. */
if (((mode & ~dirtype) & (FILE_ATTRIBUTE_HIDDEN | aSYSTEM | aDIR)) != 0) if (((mode & ~dirtype) & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM | aDIR)) != 0)
return False; return False;
/* Check the "must have" bits, which are the may have bits shifted eight */ /* 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 /* If must have bit is set, the file/dir can not be returned in search unless the matching
file attribute is set */ file attribute is set */
mask = ((dirtype >> 8) & (aDIR|aARCH|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN|aSYSTEM)); /* & 0x37 */ mask = ((dirtype >> 8) & (aDIR|aARCH|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM)); /* & 0x37 */
if(mask) { if(mask) {
if((mask & (mode & (aDIR|aARCH|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN|aSYSTEM))) == mask) /* check if matching attribute present */ if((mask & (mode & (aDIR|aARCH|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM))) == mask) /* check if matching attribute present */
return True; return True;
else else
return False; return False;

14
source3/smbd/dosmode.c
View File

@ -186,7 +186,7 @@ static uint32 dos_mode_from_sbuf(connection_struct *conn,
result |= aARCH; result |= aARCH;
if (MAP_SYSTEM(conn) && ((smb_fname->st.st_ex_mode & S_IXGRP) != 0)) if (MAP_SYSTEM(conn) && ((smb_fname->st.st_ex_mode & S_IXGRP) != 0))
result |= aSYSTEM; result |= FILE_ATTRIBUTE_SYSTEM;
if (MAP_HIDDEN(conn) && ((smb_fname->st.st_ex_mode & S_IXOTH) != 0)) if (MAP_HIDDEN(conn) && ((smb_fname->st.st_ex_mode & S_IXOTH) != 0))
result |= FILE_ATTRIBUTE_HIDDEN; result |= FILE_ATTRIBUTE_HIDDEN;
@ -200,7 +200,7 @@ static uint32 dos_mode_from_sbuf(connection_struct *conn,
if (result & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h")); if (result & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h"));
if (result & FILE_ATTRIBUTE_READONLY ) DEBUG(8, ("r")); if (result & FILE_ATTRIBUTE_READONLY ) DEBUG(8, ("r"));
if (result & aSYSTEM) DEBUG(8, ("s")); if (result & FILE_ATTRIBUTE_SYSTEM) DEBUG(8, ("s"));
if (result & aDIR ) DEBUG(8, ("d")); if (result & aDIR ) DEBUG(8, ("d"));
if (result & aARCH ) DEBUG(8, ("a")); if (result & aARCH ) DEBUG(8, ("a"));
@ -327,7 +327,7 @@ static bool get_ea_dos_attribute(connection_struct *conn,
if (dosattr & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h")); if (dosattr & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h"));
if (dosattr & FILE_ATTRIBUTE_READONLY ) DEBUG(8, ("r")); if (dosattr & FILE_ATTRIBUTE_READONLY ) DEBUG(8, ("r"));
if (dosattr & aSYSTEM) DEBUG(8, ("s")); if (dosattr & FILE_ATTRIBUTE_SYSTEM) DEBUG(8, ("s"));
if (dosattr & aDIR ) DEBUG(8, ("d")); if (dosattr & aDIR ) DEBUG(8, ("d"));
if (dosattr & aARCH ) DEBUG(8, ("a")); if (dosattr & aARCH ) DEBUG(8, ("a"));
@ -488,7 +488,7 @@ uint32 dos_mode_msdfs(connection_struct *conn,
if (result & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h")); if (result & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h"));
if (result & FILE_ATTRIBUTE_READONLY ) DEBUG(8, ("r")); if (result & FILE_ATTRIBUTE_READONLY ) DEBUG(8, ("r"));
if (result & aSYSTEM) DEBUG(8, ("s")); if (result & FILE_ATTRIBUTE_SYSTEM) DEBUG(8, ("s"));
if (result & aDIR ) DEBUG(8, ("d")); if (result & aDIR ) DEBUG(8, ("d"));
if (result & aARCH ) DEBUG(8, ("a")); if (result & aARCH ) DEBUG(8, ("a"));
if (result & FILE_ATTRIBUTE_SPARSE ) DEBUG(8, ("[sparse]")); if (result & FILE_ATTRIBUTE_SPARSE ) DEBUG(8, ("[sparse]"));
@ -513,7 +513,7 @@ int dos_attributes_to_stat_dos_flags(uint32_t dosmode)
dos_stat_flags |= UF_DOS_HIDDEN; dos_stat_flags |= UF_DOS_HIDDEN;
if (dosmode & FILE_ATTRIBUTE_READONLY) if (dosmode & FILE_ATTRIBUTE_READONLY)
dos_stat_flags |= UF_DOS_RO; dos_stat_flags |= UF_DOS_RO;
if (dosmode & aSYSTEM) if (dosmode & FILE_ATTRIBUTE_SYSTEM)
dos_stat_flags |= UF_DOS_SYSTEM; dos_stat_flags |= UF_DOS_SYSTEM;
if (dosmode & FILE_ATTRIBUTE_NONINDEXED) if (dosmode & FILE_ATTRIBUTE_NONINDEXED)
dos_stat_flags |= UF_DOS_NOINDEX; dos_stat_flags |= UF_DOS_NOINDEX;
@ -546,7 +546,7 @@ static bool get_stat_dos_flags(connection_struct *conn,
if (smb_fname->st.st_ex_flags & UF_DOS_RO) if (smb_fname->st.st_ex_flags & UF_DOS_RO)
*dosmode |= FILE_ATTRIBUTE_READONLY; *dosmode |= FILE_ATTRIBUTE_READONLY;
if (smb_fname->st.st_ex_flags & UF_DOS_SYSTEM) if (smb_fname->st.st_ex_flags & UF_DOS_SYSTEM)
*dosmode |= aSYSTEM; *dosmode |= FILE_ATTRIBUTE_SYSTEM;
if (smb_fname->st.st_ex_flags & UF_DOS_NOINDEX) if (smb_fname->st.st_ex_flags & UF_DOS_NOINDEX)
*dosmode |= FILE_ATTRIBUTE_NONINDEXED; *dosmode |= FILE_ATTRIBUTE_NONINDEXED;
if (smb_fname->st.st_ex_flags & FILE_ATTRIBUTE_SPARSE) if (smb_fname->st.st_ex_flags & FILE_ATTRIBUTE_SPARSE)
@ -673,7 +673,7 @@ uint32 dos_mode(connection_struct *conn, struct smb_filename *smb_fname)
if (result & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h")); if (result & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h"));
if (result & FILE_ATTRIBUTE_READONLY ) DEBUG(8, ("r")); if (result & FILE_ATTRIBUTE_READONLY ) DEBUG(8, ("r"));
if (result & aSYSTEM) DEBUG(8, ("s")); if (result & FILE_ATTRIBUTE_SYSTEM) DEBUG(8, ("s"));
if (result & aDIR ) DEBUG(8, ("d")); if (result & aDIR ) DEBUG(8, ("d"));
if (result & aARCH ) DEBUG(8, ("a")); if (result & aARCH ) DEBUG(8, ("a"));
if (result & FILE_ATTRIBUTE_SPARSE ) DEBUG(8, ("[sparse]")); if (result & FILE_ATTRIBUTE_SPARSE ) DEBUG(8, ("[sparse]"));

2
source3/smbd/nttrans.c
View File

@ -1363,7 +1363,7 @@ static NTSTATUS copy_internals(TALLOC_CTX *ctx,
/* Ensure attributes match. */ /* Ensure attributes match. */
fattr = dos_mode(conn, smb_fname_src); fattr = dos_mode(conn, smb_fname_src);
if ((fattr & ~attrs) & (FILE_ATTRIBUTE_HIDDEN | aSYSTEM)) { if ((fattr & ~attrs) & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) {
status = NT_STATUS_NO_SUCH_FILE; status = NT_STATUS_NO_SUCH_FILE;
goto out; goto out;
} }

4
source3/smbd/reply.c
View File

@ -2388,7 +2388,7 @@ static NTSTATUS can_rename(connection_struct *conn, files_struct *fsp,
} }
fmode = dos_mode(conn, fsp->fsp_name); fmode = dos_mode(conn, fsp->fsp_name);
if ((fmode & ~dirtype) & (FILE_ATTRIBUTE_HIDDEN | aSYSTEM)) { if ((fmode & ~dirtype) & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) {
return NT_STATUS_NO_SUCH_FILE; 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;
} }
dirtype &= (aDIR|aARCH|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN|aSYSTEM); dirtype &= (aDIR|aARCH|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM);
if (!dirtype) { if (!dirtype) {
return NT_STATUS_NO_SUCH_FILE; return NT_STATUS_NO_SUCH_FILE;
} }

2
source3/smbd/smb2_find.c
View File

@ -228,7 +228,7 @@ static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
int last_entry_off = 0; int last_entry_off = 0;
int off = 0; int off = 0;
uint32_t num = 0; uint32_t num = 0;
uint32_t dirtype = FILE_ATTRIBUTE_HIDDEN | aSYSTEM | aDIR; uint32_t dirtype = FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM | aDIR;
bool dont_descend = false; bool dont_descend = false;
bool ask_sharemode = true; bool ask_sharemode = true;

8
source3/torture/denytest.c
View File

@ -1421,7 +1421,7 @@ bool torture_denytest1(int dummy)
printf("starting denytest1\n"); printf("starting denytest1\n");
for (i=0;i<2;i++) { for (i=0;i<2;i++) {
cli_unlink(cli1, fnames[i], aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fnames[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_open(cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE, &fnum1); cli_open(cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE, &fnum1);
cli_writeall(cli1, fnum1, 0, (uint8_t *)fnames[i], 0, cli_writeall(cli1, fnum1, 0, (uint8_t *)fnames[i], 0,
strlen(fnames[i]), NULL); strlen(fnames[i]), NULL);
@ -1484,7 +1484,7 @@ bool torture_denytest1(int dummy)
} }
for (i=0;i<2;i++) { for (i=0;i<2;i++) {
cli_unlink(cli1, fnames[i], aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fnames[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
} }
if (!torture_close_connection(cli1)) { if (!torture_close_connection(cli1)) {
@ -1515,7 +1515,7 @@ bool torture_denytest2(int dummy)
printf("starting denytest2\n"); printf("starting denytest2\n");
for (i=0;i<2;i++) { for (i=0;i<2;i++) {
cli_unlink(cli1, fnames[i], aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fnames[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_open(cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE, &fnum1); cli_open(cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE, &fnum1);
cli_writeall(cli1, fnum1, 0, (uint8_t *)fnames[i], 0, cli_writeall(cli1, fnum1, 0, (uint8_t *)fnames[i], 0,
strlen(fnames[i]), NULL); strlen(fnames[i]), NULL);
@ -1576,7 +1576,7 @@ bool torture_denytest2(int dummy)
} }
for (i=0;i<2;i++) { for (i=0;i<2;i++) {
cli_unlink(cli1, fnames[i], aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fnames[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
} }
if (!torture_close_connection(cli1)) { if (!torture_close_connection(cli1)) {

2
source3/torture/locktest.c
View File

@ -400,7 +400,7 @@ static void close_files(struct cli_state *cli[NSERVERS][NCONNECTIONS],
} }
} }
for (server=0;server<NSERVERS;server++) { for (server=0;server<NSERVERS;server++) {
cli_unlink(cli[server][0], FILENAME, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli[server][0], FILENAME, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
} }
} }

2
source3/torture/locktest2.c
View File

@ -325,7 +325,7 @@ static void close_files(struct cli_state *cli[NSERVERS][NCONNECTIONS],
} }
} }
for (server=0;server<NSERVERS;server++) { for (server=0;server<NSERVERS;server++) {
cli_unlink(cli[server][0], FILENAME, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli[server][0], FILENAME, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
} }
} }

10
source3/torture/mangle_test.c
View File

@ -58,7 +58,7 @@ static bool test_one(struct cli_state *cli, const char *name)
} }
fstr_sprintf(name2, "\\mangle_test\\%s", shortname); fstr_sprintf(name2, "\\mangle_test\\%s", shortname);
if (!NT_STATUS_IS_OK(cli_unlink(cli, name2, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(cli, name2, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
printf("unlink of %s (%s) failed (%s)\n", printf("unlink of %s (%s) failed (%s)\n",
name2, name, cli_errstr(cli)); name2, name, cli_errstr(cli));
return False; return False;
@ -75,11 +75,11 @@ static bool test_one(struct cli_state *cli, const char *name)
} }
/* and unlink by long name */ /* and unlink by long name */
if (!NT_STATUS_IS_OK(cli_unlink(cli, name, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(cli, name, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
printf("unlink2 of %s (%s) failed (%s)\n", printf("unlink2 of %s (%s) failed (%s)\n",
name, name2, cli_errstr(cli)); name, name2, cli_errstr(cli));
failures++; failures++;
cli_unlink(cli, name2, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, name2, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
return True; return True;
} }
@ -178,7 +178,7 @@ bool torture_mangle(int dummy)
return False; return False;
} }
cli_unlink(cli, "\\mangle_test\\*", aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, "\\mangle_test\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_rmdir(cli, "\\mangle_test"); cli_rmdir(cli, "\\mangle_test");
if (!NT_STATUS_IS_OK(cli_mkdir(cli, "\\mangle_test"))) { if (!NT_STATUS_IS_OK(cli_mkdir(cli, "\\mangle_test"))) {
@ -202,7 +202,7 @@ bool torture_mangle(int dummy)
} }
} }
cli_unlink(cli, "\\mangle_test\\*", aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, "\\mangle_test\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_rmdir(cli, "\\mangle_test"))) { if (!NT_STATUS_IS_OK(cli_rmdir(cli, "\\mangle_test"))) {
printf("ERROR: Failed to remove directory\n"); printf("ERROR: Failed to remove directory\n");
return False; return False;

4
source3/torture/masktest.c
View File

@ -371,7 +371,7 @@ static void testpair(struct cli_state *cli, const char *mask, const char *file)
if (die_on_error) exit(1); if (die_on_error) exit(1);
} }
cli_unlink(cli, file, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, file, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (count % 100 == 0) DEBUG(0,("%d\n", count)); if (count % 100 == 0) DEBUG(0,("%d\n", count));
SAFE_FREE(long_name); SAFE_FREE(long_name);
@ -388,7 +388,7 @@ static void test_mask(int argc, char *argv[],
cli_mkdir(cli, "\\masktest"); cli_mkdir(cli, "\\masktest");
cli_unlink(cli, "\\masktest\\*", aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, "\\masktest\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (argc >= 2) { if (argc >= 2) {
while (argc >= 2) { while (argc >= 2) {

2
source3/torture/nbio.c
View File

@ -134,7 +134,7 @@ void nb_setup(struct cli_state *cli)
void nb_unlink(const char *fname) void nb_unlink(const char *fname)
{ {
if (!NT_STATUS_IS_OK(cli_unlink(c, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(c, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
#if NBDEBUG #if NBDEBUG
printf("(%d) unlink %s failed (%s)\n", printf("(%d) unlink %s failed (%s)\n",
line_count, fname, cli_errstr(c)); line_count, fname, cli_errstr(c));

4
source3/torture/scanner.c
View File

@ -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, status = try_trans2_len(cli, "newfile", op, level, param, data, param_len, &data_len,
&rparam_len, &rdata_len); &rparam_len, &rdata_len);
cli_unlink(cli, "\\newfile.dat", aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, "\\newfile.dat", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_rmdir(cli, "\\newfile.dat"); cli_rmdir(cli, "\\newfile.dat");
if (NT_STATUS_IS_OK(status)) return True; 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, status = try_nttrans_len(cli, "newfile", op, level, param, data, param_len, &data_len,
&rparam_len, &rdata_len); &rparam_len, &rdata_len);
cli_unlink(cli, "\\newfile.dat", aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, "\\newfile.dat", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_rmdir(cli, "\\newfile.dat"); cli_rmdir(cli, "\\newfile.dat");
if (NT_STATUS_IS_OK(status)) return True; if (NT_STATUS_IS_OK(status)) return True;

208
source3/torture/torture.c
View File

@ -629,7 +629,7 @@ static bool rw_torture(struct cli_state *c)
correct = False; correct = False;
} }
if (!NT_STATUS_IS_OK(cli_unlink(c, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(c, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
printf("unlink failed (%s)\n", cli_errstr(c)); printf("unlink failed (%s)\n", cli_errstr(c));
correct = False; correct = False;
} }
@ -641,7 +641,7 @@ static bool rw_torture(struct cli_state *c)
} }
cli_close(c, fnum2); cli_close(c, fnum2);
cli_unlink(c, lockfname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(c, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
printf("%d\n", i); printf("%d\n", i);
@ -686,7 +686,7 @@ static bool rw_torture3(struct cli_state *c, char *lockfname)
if (procnum == 0) if (procnum == 0)
{ {
if (!NT_STATUS_IS_OK(cli_unlink(c, lockfname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(c, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
printf("unlink failed (%s) (normal, this file should not exist)\n", cli_errstr(c)); printf("unlink failed (%s) (normal, this file should not exist)\n", cli_errstr(c));
} }
@ -786,7 +786,7 @@ static bool rw_torture2(struct cli_state *c1, struct cli_state *c2)
bool correct = True; bool correct = True;
ssize_t bytes_read; ssize_t bytes_read;
if (!NT_STATUS_IS_OK(cli_unlink(c1, lockfname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(c1, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
printf("unlink failed (%s) (normal, this file should not exist)\n", cli_errstr(c1)); printf("unlink failed (%s) (normal, this file should not exist)\n", cli_errstr(c1));
} }
@ -847,7 +847,7 @@ static bool rw_torture2(struct cli_state *c1, struct cli_state *c2)
correct = False; correct = False;
} }
if (!NT_STATUS_IS_OK(cli_unlink(c1, lockfname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(c1, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
printf("unlink failed (%s)\n", cli_errstr(c1)); printf("unlink failed (%s)\n", cli_errstr(c1));
correct = False; correct = False;
} }
@ -933,7 +933,7 @@ static bool run_readwritelarge_internal(int max_xmit_k)
printf("starting readwritelarge_internal\n"); printf("starting readwritelarge_internal\n");
cli_unlink(cli1, lockfname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_open(cli1, lockfname, O_RDWR | O_CREAT | O_EXCL, DENY_NONE, &fnum1))) { 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)); printf("open read/write of %s failed (%s)\n", lockfname, cli_errstr(cli1));
@ -963,7 +963,7 @@ static bool run_readwritelarge_internal(int max_xmit_k)
correct = False; correct = False;
} }
if (!NT_STATUS_IS_OK(cli_unlink(cli1, lockfname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(cli1, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
printf("unlink failed (%s)\n", cli_errstr(cli1)); printf("unlink failed (%s)\n", cli_errstr(cli1));
correct = False; correct = False;
} }
@ -1180,7 +1180,7 @@ static bool run_locktest1(int dummy)
printf("starting locktest1\n"); printf("starting locktest1\n");
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) { 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)); printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
@ -1252,7 +1252,7 @@ static bool run_locktest1(int dummy)
return False; return False;
} }
if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
printf("unlink failed (%s)\n", cli_errstr(cli1)); printf("unlink failed (%s)\n", cli_errstr(cli1));
return False; return False;
} }
@ -1294,7 +1294,7 @@ static bool run_tcon_test(int dummy)
printf("starting tcontest\n"); printf("starting tcontest\n");
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) { 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)); printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
@ -1561,7 +1561,7 @@ static bool run_locktest2(int dummy)
printf("starting locktest2\n"); printf("starting locktest2\n");
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_setpid(cli, 1); cli_setpid(cli, 1);
@ -1698,7 +1698,7 @@ static bool run_locktest3(int dummy)
printf("starting locktest3\n"); printf("starting locktest3\n");
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) { 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)); printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
@ -1778,7 +1778,7 @@ static bool run_locktest3(int dummy)
return False; return False;
} }
if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
printf("unlink failed (%s)\n", cli_errstr(cli1)); printf("unlink failed (%s)\n", cli_errstr(cli1));
return False; return False;
} }
@ -1822,7 +1822,7 @@ static bool run_locktest4(int dummy)
printf("starting locktest4\n"); printf("starting locktest4\n");
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1); cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1);
cli_open(cli2, fname, O_RDWR, DENY_NONE, &fnum2); cli_open(cli2, fname, O_RDWR, DENY_NONE, &fnum2);
@ -1974,7 +1974,7 @@ static bool run_locktest4(int dummy)
fail: fail:
cli_close(cli1, fnum1); cli_close(cli1, fnum1);
cli_close(cli2, fnum2); cli_close(cli2, fnum2);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
torture_close_connection(cli1); torture_close_connection(cli1);
torture_close_connection(cli2); torture_close_connection(cli2);
@ -2004,7 +2004,7 @@ static bool run_locktest5(int dummy)
printf("starting locktest5\n"); printf("starting locktest5\n");
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1); cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1);
cli_open(cli2, fname, O_RDWR, DENY_NONE, &fnum2); cli_open(cli2, fname, O_RDWR, DENY_NONE, &fnum2);
@ -2096,7 +2096,7 @@ static bool run_locktest5(int dummy)
fail: fail:
cli_close(cli1, fnum1); cli_close(cli1, fnum1);
cli_close(cli2, fnum2); cli_close(cli2, fnum2);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!torture_close_connection(cli1)) { if (!torture_close_connection(cli1)) {
correct = False; correct = False;
} }
@ -2131,7 +2131,7 @@ static bool run_locktest6(int dummy)
for (i=0;i<1;i++) { for (i=0;i<1;i++) {
printf("Testing %s\n", fname[i]); printf("Testing %s\n", fname[i]);
cli_unlink(cli, fname[i], aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_open(cli, fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum); 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); status = cli_locktype(cli, fnum, 0, 8, 0, LOCKING_ANDX_CHANGE_LOCKTYPE);
@ -2143,7 +2143,7 @@ static bool run_locktest6(int dummy)
cli_close(cli, fnum); cli_close(cli, fnum);
printf("CANCEL_LOCK gave %s\n", nt_errstr(status)); printf("CANCEL_LOCK gave %s\n", nt_errstr(status));
cli_unlink(cli, fname[i], aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
} }
torture_close_connection(cli); torture_close_connection(cli);
@ -2169,7 +2169,7 @@ static bool run_locktest7(int dummy)
printf("starting locktest7\n"); printf("starting locktest7\n");
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1); cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1);
@ -2289,7 +2289,7 @@ static bool run_locktest7(int dummy)
fail: fail:
cli_close(cli1, fnum1); cli_close(cli1, fnum1);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
torture_close_connection(cli1); torture_close_connection(cli1);
printf("finished locktest7\n"); printf("finished locktest7\n");
@ -2321,7 +2321,7 @@ static bool run_locktest8(int dummy)
printf("starting locktest8\n"); printf("starting locktest8\n");
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
status = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_WRITE, status = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_WRITE,
&fnum1); &fnum1);
@ -2363,7 +2363,7 @@ static bool run_locktest8(int dummy)
fail: fail:
cli_close(cli1, fnum1); cli_close(cli1, fnum1);
cli_close(cli1, fnum2); cli_close(cli1, fnum2);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
torture_close_connection(cli1); torture_close_connection(cli1);
printf("finished locktest8\n"); printf("finished locktest8\n");
@ -2593,7 +2593,7 @@ static bool run_fdpasstest(int dummy)
printf("starting fdpasstest\n"); printf("starting fdpasstest\n");
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) { 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)); printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
@ -2618,7 +2618,7 @@ static bool run_fdpasstest(int dummy)
} }
cli_close(cli1, fnum1); cli_close(cli1, fnum1);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
torture_close_connection(cli1); torture_close_connection(cli1);
torture_close_connection(cli2); torture_close_connection(cli2);
@ -2657,8 +2657,8 @@ static bool run_fdsesstest(int dummy)
printf("starting fdsesstest\n"); printf("starting fdsesstest\n");
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_unlink(cli, fname1, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) { 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)); printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
@ -2684,7 +2684,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))) { 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"); printf("create with different vuid, same cnum succeeded.\n");
cli_close(cli, fnum2); cli_close(cli, fnum2);
cli_unlink(cli, fname1, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
} else { } else {
printf("create with different vuid, same cnum failed.\n"); printf("create with different vuid, same cnum failed.\n");
printf("This will cause problems with service clients.\n"); printf("This will cause problems with service clients.\n");
@ -2704,7 +2704,7 @@ static bool run_fdsesstest(int dummy)
cli->cnum = saved_cnum; cli->cnum = saved_cnum;
cli_close(cli, fnum1); cli_close(cli, fnum1);
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
torture_close_connection(cli); torture_close_connection(cli);
@ -2732,7 +2732,7 @@ static bool run_unlinktest(int dummy)
printf("starting unlink test\n"); printf("starting unlink test\n");
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_setpid(cli, 1); cli_setpid(cli, 1);
@ -2741,7 +2741,7 @@ static bool run_unlinktest(int dummy)
return False; return False;
} }
if (NT_STATUS_IS_OK(cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (NT_STATUS_IS_OK(cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
printf("error: server allowed unlink on an open file\n"); printf("error: server allowed unlink on an open file\n");
correct = False; correct = False;
} else { } else {
@ -2750,7 +2750,7 @@ static bool run_unlinktest(int dummy)
} }
cli_close(cli, fnum); cli_close(cli, fnum);
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!torture_close_connection(cli)) { if (!torture_close_connection(cli)) {
correct = False; correct = False;
@ -2802,7 +2802,7 @@ static bool run_maxfidtest(int dummy)
for (;i>=0;i--) { for (;i>=0;i--) {
slprintf(fname,sizeof(fname)-1,ftemplate, i,(int)getpid()); slprintf(fname,sizeof(fname)-1,ftemplate, i,(int)getpid());
cli_close(cli, fnums[i]); cli_close(cli, fnums[i]);
if (!NT_STATUS_IS_OK(cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
printf("unlink of %s failed (%s)\n", printf("unlink of %s failed (%s)\n",
fname, cli_errstr(cli)); fname, cli_errstr(cli));
correct = False; correct = False;
@ -2998,7 +2998,7 @@ static bool run_attrtest(int dummy)
return False; return False;
} }
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_open(cli, fname, cli_open(cli, fname,
O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum); O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum);
cli_close(cli, fnum); cli_close(cli, fnum);
@ -3033,7 +3033,7 @@ static bool run_attrtest(int dummy)
correct = True; correct = True;
} }
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!torture_close_connection(cli)) { if (!torture_close_connection(cli)) {
correct = False; correct = False;
@ -3076,7 +3076,7 @@ static bool run_trans2test(int dummy)
correct = false; correct = false;
} }
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_open(cli, fname, cli_open(cli, fname,
O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum); O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum);
if (!NT_STATUS_IS_OK(cli_qfileinfo_basic( if (!NT_STATUS_IS_OK(cli_qfileinfo_basic(
@ -3102,7 +3102,7 @@ static bool run_trans2test(int dummy)
sleep(2); sleep(2);
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_open(cli, fname, if (!NT_STATUS_IS_OK(cli_open(cli, fname,
O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum))) { O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum))) {
printf("open of %s failed (%s)\n", fname, cli_errstr(cli)); printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
@ -3134,7 +3134,7 @@ static bool run_trans2test(int dummy)
} }
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_open(cli, fname, cli_open(cli, fname,
O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum); O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum);
cli_close(cli, fnum); cli_close(cli, fnum);
@ -3151,7 +3151,7 @@ static bool run_trans2test(int dummy)
} }
} }
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
/* check if the server updates the directory modification time /* check if the server updates the directory modification time
@ -3184,7 +3184,7 @@ static bool run_trans2test(int dummy)
correct = False; correct = False;
} }
} }
cli_unlink(cli, fname2, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname2, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_rmdir(cli, dname); cli_rmdir(cli, dname);
if (!torture_close_connection(cli)) { if (!torture_close_connection(cli)) {
@ -3269,7 +3269,7 @@ static bool run_oplock1(int dummy)
return False; return False;
} }
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_sockopt(cli1, sockops); cli_sockopt(cli1, sockops);
@ -3282,15 +3282,15 @@ static bool run_oplock1(int dummy)
cli1->use_oplocks = False; cli1->use_oplocks = False;
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) { if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
printf("close2 failed (%s)\n", cli_errstr(cli1)); printf("close2 failed (%s)\n", cli_errstr(cli1));
return False; return False;
} }
if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
printf("unlink failed (%s)\n", cli_errstr(cli1)); printf("unlink failed (%s)\n", cli_errstr(cli1));
return False; return False;
} }
@ -3340,7 +3340,7 @@ static bool run_oplock2(int dummy)
cli2->use_oplocks = True; cli2->use_oplocks = True;
cli2->use_level_II_oplocks = True; cli2->use_level_II_oplocks = True;
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_sockopt(cli1, sockops); cli_sockopt(cli1, sockops);
cli_sockopt(cli2, sockops); cli_sockopt(cli2, sockops);
@ -3412,7 +3412,7 @@ static bool run_oplock2(int dummy)
sleep(4); sleep(4);
if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
printf("unlink failed (%s)\n", cli_errstr(cli1)); printf("unlink failed (%s)\n", cli_errstr(cli1));
correct = False; correct = False;
} }
@ -3526,8 +3526,8 @@ static bool run_oplock4(int dummy)
return false; return false;
} }
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_unlink(cli1, fname_ln, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname_ln, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_sockopt(cli1, sockops); cli_sockopt(cli1, sockops);
cli_sockopt(cli2, sockops); cli_sockopt(cli2, sockops);
@ -3611,11 +3611,11 @@ static bool run_oplock4(int dummy)
correct = false; correct = false;
} }
if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
printf("unlink failed (%s)\n", cli_errstr(cli1)); printf("unlink failed (%s)\n", cli_errstr(cli1));
correct = false; correct = false;
} }
if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname_ln, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname_ln, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
printf("unlink failed (%s)\n", cli_errstr(cli1)); printf("unlink failed (%s)\n", cli_errstr(cli1));
correct = false; correct = false;
} }
@ -3657,7 +3657,7 @@ static bool run_deletetest(int dummy)
/* Test 1 - this should delete the file on close. */ /* Test 1 - this should delete the file on close. */
cli_setatr(cli1, fname, 0, 0); cli_setatr(cli1, fname, 0, 0);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_ALL_ACCESS|DELETE_ACCESS, FILE_ATTRIBUTE_NORMAL, if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_ALL_ACCESS|DELETE_ACCESS, FILE_ATTRIBUTE_NORMAL,
0, FILE_OVERWRITE_IF, 0, FILE_OVERWRITE_IF,
@ -3684,7 +3684,7 @@ static bool run_deletetest(int dummy)
/* Test 2 - this should delete the file on close. */ /* Test 2 - this should delete the file on close. */
cli_setatr(cli1, fname, 0, 0); cli_setatr(cli1, fname, 0, 0);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_ALL_ACCESS, if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_ALL_ACCESS,
FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
@ -3713,13 +3713,13 @@ static bool run_deletetest(int dummy)
correct = False; correct = False;
goto fail; goto fail;
} }
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
} else } else
printf("second delete on close test succeeded.\n"); printf("second delete on close test succeeded.\n");
/* Test 3 - ... */ /* Test 3 - ... */
cli_setatr(cli1, fname, 0, 0); cli_setatr(cli1, fname, 0, 0);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL, 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))) { FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
@ -3772,7 +3772,7 @@ static bool run_deletetest(int dummy)
if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) { if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
printf("[3] close failed (%s)\n", cli_errstr(cli1)); printf("[3] close failed (%s)\n", cli_errstr(cli1));
} }
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
correct = False; correct = False;
goto fail; goto fail;
} else } else
@ -3780,7 +3780,7 @@ static bool run_deletetest(int dummy)
/* Test 4 ... */ /* Test 4 ... */
cli_setatr(cli1, fname, 0, 0); cli_setatr(cli1, fname, 0, 0);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS, 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))) { FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
@ -3827,7 +3827,7 @@ static bool run_deletetest(int dummy)
/* Test 5 ... */ /* Test 5 ... */
cli_setatr(cli1, fname, 0, 0); cli_setatr(cli1, fname, 0, 0);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT, DENY_NONE, &fnum1))) { 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)); printf("[5] open of %s failed (%s)\n", fname, cli_errstr(cli1));
@ -3853,7 +3853,7 @@ static bool run_deletetest(int dummy)
/* Test 6 ... */ /* Test 6 ... */
cli_setatr(cli1, fname, 0, 0); cli_setatr(cli1, fname, 0, 0);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA, 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, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
@ -3881,7 +3881,7 @@ static bool run_deletetest(int dummy)
/* Test 7 ... */ /* Test 7 ... */
cli_setatr(cli1, fname, 0, 0); cli_setatr(cli1, fname, 0, 0);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS, 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))) { FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
@ -3926,7 +3926,7 @@ static bool run_deletetest(int dummy)
/* Test 7 ... */ /* Test 7 ... */
cli_setatr(cli1, fname, 0, 0); cli_setatr(cli1, fname, 0, 0);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!torture_open_connection(&cli2, 1)) { if (!torture_open_connection(&cli2, 1)) {
printf("[8] failed to open second connection.\n"); printf("[8] failed to open second connection.\n");
@ -4011,7 +4011,7 @@ static bool run_deletetest(int dummy)
printf("tenth delete on close test succeeded.\n"); printf("tenth delete on close test succeeded.\n");
cli_setatr(cli1, fname, 0, 0); cli_setatr(cli1, fname, 0, 0);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
/* What error do we get when attempting to open a read-only file with /* What error do we get when attempting to open a read-only file with
delete access ? */ delete access ? */
@ -4059,7 +4059,7 @@ static bool run_deletetest(int dummy)
if (fnum1 != (uint16_t)-1) cli_close(cli1, fnum1); if (fnum1 != (uint16_t)-1) cli_close(cli1, fnum1);
if (fnum2 != (uint16_t)-1) cli_close(cli1, fnum2); if (fnum2 != (uint16_t)-1) cli_close(cli1, fnum2);
cli_setatr(cli1, fname, 0, 0); cli_setatr(cli1, fname, 0, 0);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (cli1 && !torture_close_connection(cli1)) { if (cli1 && !torture_close_connection(cli1)) {
correct = False; correct = False;
@ -4087,8 +4087,8 @@ static bool run_deletetest_ln(int dummy)
return false; return false;
} }
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_unlink(cli, fname_ln, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname_ln, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_sockopt(cli, sockops); cli_sockopt(cli, sockops);
@ -4169,8 +4169,8 @@ static bool run_deletetest_ln(int dummy)
correct = False; correct = False;
} }
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_unlink(cli, fname_ln, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname_ln, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!torture_close_connection(cli)) { if (!torture_close_connection(cli)) {
correct = false; correct = false;
@ -4287,8 +4287,8 @@ static bool run_rename(int dummy)
return False; return False;
} }
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_unlink(cli1, fname1, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL, 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))) { FILE_SHARE_READ, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
printf("First open failed - %s\n", cli_errstr(cli1)); printf("First open failed - %s\n", cli_errstr(cli1));
@ -4307,8 +4307,8 @@ static bool run_rename(int dummy)
return False; return False;
} }
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_unlink(cli1, fname1, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
status = cli_ntcreate(cli1, fname, 0, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL, status = cli_ntcreate(cli1, fname, 0, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
#if 0 #if 0
FILE_SHARE_DELETE|FILE_SHARE_NONE, FILE_SHARE_DELETE|FILE_SHARE_NONE,
@ -4333,8 +4333,8 @@ static bool run_rename(int dummy)
return False; return False;
} }
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_unlink(cli1, fname1, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, READ_CONTROL_ACCESS, FILE_ATTRIBUTE_NORMAL, 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))) { FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
@ -4376,8 +4376,8 @@ static bool run_rename(int dummy)
return False; return False;
} }
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_unlink(cli1, fname1, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
/*----*/ /*----*/
@ -4399,8 +4399,8 @@ static bool run_rename(int dummy)
return False; return False;
} }
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_unlink(cli1, fname1, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
/*--*/ /*--*/
@ -4457,8 +4457,8 @@ static bool run_rename(int dummy)
} }
} }
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_unlink(cli1, fname1, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!torture_close_connection(cli1)) { if (!torture_close_connection(cli1)) {
correct = False; correct = False;
@ -4517,7 +4517,7 @@ static bool run_opentest(int dummy)
} }
cli_setatr(cli1, fname, 0, 0); cli_setatr(cli1, fname, 0, 0);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_sockopt(cli1, sockops); cli_sockopt(cli1, sockops);
@ -4575,7 +4575,7 @@ static bool run_opentest(int dummy)
return False; return False;
} }
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
printf("finished open test 2\n"); printf("finished open test 2\n");
@ -4636,7 +4636,7 @@ static bool run_opentest(int dummy)
} }
printf("finished open test 3\n"); printf("finished open test 3\n");
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
printf("Do ctemp tests\n"); printf("Do ctemp tests\n");
if (!NT_STATUS_IS_OK(cli_ctemp(cli1, talloc_tos(), "\\", &fnum1, &tmp_path))) { if (!NT_STATUS_IS_OK(cli_ctemp(cli1, talloc_tos(), "\\", &fnum1, &tmp_path))) {
@ -4647,7 +4647,7 @@ static bool run_opentest(int dummy)
if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) { if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
printf("close of temp failed (%s)\n", cli_errstr(cli1)); printf("close of temp failed (%s)\n", cli_errstr(cli1));
} }
if (!NT_STATUS_IS_OK(cli_unlink(cli1, tmp_path, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(cli1, tmp_path, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
printf("unlink of temp failed (%s)\n", cli_errstr(cli1)); printf("unlink of temp failed (%s)\n", cli_errstr(cli1));
} }
@ -4658,7 +4658,7 @@ static bool run_opentest(int dummy)
} }
cli_setatr(cli2, fname, 0, 0); cli_setatr(cli2, fname, 0, 0);
cli_unlink(cli2, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli2, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_sockopt(cli2, sockops); cli_sockopt(cli2, sockops);
@ -4687,7 +4687,7 @@ static bool run_opentest(int dummy)
printf("non-io open test #1 passed.\n"); printf("non-io open test #1 passed.\n");
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
printf("TEST #2 testing 2 non-io opens (first with delete)\n"); printf("TEST #2 testing 2 non-io opens (first with delete)\n");
@ -4714,7 +4714,7 @@ static bool run_opentest(int dummy)
printf("non-io open test #2 passed.\n"); printf("non-io open test #2 passed.\n");
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
printf("TEST #3 testing 2 non-io opens (second with delete)\n"); printf("TEST #3 testing 2 non-io opens (second with delete)\n");
@ -4741,7 +4741,7 @@ static bool run_opentest(int dummy)
printf("non-io open test #3 passed.\n"); printf("non-io open test #3 passed.\n");
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
printf("TEST #4 testing 2 non-io opens (both with delete)\n"); printf("TEST #4 testing 2 non-io opens (both with delete)\n");
@ -4766,7 +4766,7 @@ static bool run_opentest(int dummy)
printf("non-io open test #4 passed.\n"); printf("non-io open test #4 passed.\n");
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
printf("TEST #5 testing 2 non-io opens (both with delete - both with file share delete)\n"); printf("TEST #5 testing 2 non-io opens (both with delete - both with file share delete)\n");
@ -4796,7 +4796,7 @@ static bool run_opentest(int dummy)
printf("TEST #6 testing 1 non-io open, one io open\n"); printf("TEST #6 testing 1 non-io open, one io open\n");
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL, 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))) { FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
@ -4824,7 +4824,7 @@ static bool run_opentest(int dummy)
printf("TEST #7 testing 1 non-io open, one io open with delete\n"); printf("TEST #7 testing 1 non-io open, one io open with delete\n");
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL, 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))) { FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
@ -4847,7 +4847,7 @@ static bool run_opentest(int dummy)
printf("non-io open test #7 passed.\n"); printf("non-io open test #7 passed.\n");
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
printf("TEST #8 testing open without WRITE_ATTRIBUTES, updating close write time.\n"); 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, status = cli_ntcreate(cli1, fname, 0, FILE_WRITE_DATA, FILE_ATTRIBUTE_NORMAL,
@ -5220,7 +5220,7 @@ static bool run_openattrtest(int dummy)
for (k = 0, i = 0; i < sizeof(open_attrs_table)/sizeof(uint32); i++) { for (k = 0, i = 0; i < sizeof(open_attrs_table)/sizeof(uint32); i++) {
cli_setatr(cli1, fname, 0, 0); cli_setatr(cli1, fname, 0, 0);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_WRITE_DATA, open_attrs_table[i], 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))) { FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
printf("open %d (1) of %s failed (%s)\n", i, fname, cli_errstr(cli1)); printf("open %d (1) of %s failed (%s)\n", i, fname, cli_errstr(cli1));
@ -5292,7 +5292,7 @@ static bool run_openattrtest(int dummy)
} }
cli_setatr(cli1, fname, 0, 0); cli_setatr(cli1, fname, 0, 0);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
printf("open attr test %s.\n", correct ? "passed" : "failed"); printf("open attr test %s.\n", correct ? "passed" : "failed");
@ -5363,7 +5363,7 @@ static bool run_dirtest(int dummy)
for (i=0;i<torture_numops;i++) { for (i=0;i<torture_numops;i++) {
fstring fname; fstring fname;
slprintf(fname, sizeof(fname), "\\%x", (int)random()); slprintf(fname, sizeof(fname), "\\%x", (int)random());
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
} }
if (!torture_close_connection(cli)) { if (!torture_close_connection(cli)) {
@ -5389,7 +5389,7 @@ static NTSTATUS del_fn(const char *mnt, struct file_info *finfo, const char *mas
if (!NT_STATUS_IS_OK(cli_rmdir(pcli, fname))) if (!NT_STATUS_IS_OK(cli_rmdir(pcli, fname)))
printf("del_fn: failed to rmdir %s\n,", fname ); printf("del_fn: failed to rmdir %s\n,", fname );
} else { } else {
if (!NT_STATUS_IS_OK(cli_unlink(pcli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) if (!NT_STATUS_IS_OK(cli_unlink(pcli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN)))
printf("del_fn: failed to unlink %s\n,", fname ); printf("del_fn: failed to unlink %s\n,", fname );
} }
return NT_STATUS_OK; return NT_STATUS_OK;
@ -5414,7 +5414,7 @@ bool torture_ioctl_test(int dummy)
printf("starting ioctl test\n"); printf("starting ioctl test\n");
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum))) { if (!NT_STATUS_IS_OK(cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum))) {
printf("open of %s failed (%s)\n", fname, cli_errstr(cli)); printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
@ -5467,7 +5467,7 @@ bool torture_chkpath_test(int dummy)
/* cleanup from an old run */ /* cleanup from an old run */
cli_rmdir(cli, "\\chkpath.dir\\dir2"); cli_rmdir(cli, "\\chkpath.dir\\dir2");
cli_unlink(cli, "\\chkpath.dir\\*", aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, "\\chkpath.dir\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_rmdir(cli, "\\chkpath.dir"); cli_rmdir(cli, "\\chkpath.dir");
if (!NT_STATUS_IS_OK(cli_mkdir(cli, "\\chkpath.dir"))) { if (!NT_STATUS_IS_OK(cli_mkdir(cli, "\\chkpath.dir"))) {
@ -5521,7 +5521,7 @@ bool torture_chkpath_test(int dummy)
} }
cli_rmdir(cli, "\\chkpath.dir\\dir2"); cli_rmdir(cli, "\\chkpath.dir\\dir2");
cli_unlink(cli, "\\chkpath.dir\\*", aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, "\\chkpath.dir\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_rmdir(cli, "\\chkpath.dir"); cli_rmdir(cli, "\\chkpath.dir");
if (!torture_close_connection(cli)) { if (!torture_close_connection(cli)) {
@ -5550,7 +5550,7 @@ static bool run_eatest(int dummy)
return False; return False;
} }
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(cli_ntcreate(cli, fname, 0, if (!NT_STATUS_IS_OK(cli_ntcreate(cli, fname, 0,
FIRST_DESIRED_ACCESS, FILE_ATTRIBUTE_ARCHIVE, FIRST_DESIRED_ACCESS, FILE_ATTRIBUTE_ARCHIVE,
FILE_SHARE_NONE, FILE_OVERWRITE_IF, FILE_SHARE_NONE, FILE_OVERWRITE_IF,
@ -6587,7 +6587,7 @@ static bool run_windows_write(int dummy)
ret = true; ret = true;
fail: fail:
cli_close(cli1, fnum); cli_close(cli1, fnum);
cli_unlink(cli1, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
torture_close_connection(cli1); torture_close_connection(cli1);
return ret; return ret;
} }
@ -6720,7 +6720,7 @@ static NTSTATUS shortname_del_fn(const char *mnt, struct file_info *finfo,
printf("del_fn: failed to rmdir %s\n,", fname ); printf("del_fn: failed to rmdir %s\n,", fname );
} }
} else { } else {
status = cli_unlink(pcli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); status = cli_unlink(pcli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
printf("del_fn: failed to unlink %s\n,", fname ); printf("del_fn: failed to unlink %s\n,", fname );
} }
@ -6824,7 +6824,7 @@ static bool run_shortname_test(int dummy)
correct = false; correct = false;
goto out; goto out;
} }
if (!NT_STATUS_IS_OK(cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN))) { if (!NT_STATUS_IS_OK(cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
d_printf("(%s) failed to delete %s: %s\n", d_printf("(%s) failed to delete %s: %s\n",
__location__, fname, cli_errstr(cli)); __location__, fname, cli_errstr(cli));
correct = false; correct = false;
@ -6969,7 +6969,7 @@ static bool run_dir_createtime(int dummy)
return false; return false;
} }
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_rmdir(cli, dname); cli_rmdir(cli, dname);
status = cli_mkdir(cli, dname); status = cli_mkdir(cli, dname);
@ -7013,7 +7013,7 @@ static bool run_dir_createtime(int dummy)
out: out:
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_rmdir(cli, dname); cli_rmdir(cli, dname);
if (!torture_close_connection(cli)) { if (!torture_close_connection(cli)) {
ret = false; ret = false;
@ -7038,7 +7038,7 @@ static bool run_streamerror(int dummy)
return false; return false;
} }
cli_unlink(cli, "\\testdir\\*", aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, "\\testdir\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_rmdir(cli, dname); cli_rmdir(cli, dname);
status = cli_mkdir(cli, dname); status = cli_mkdir(cli, dname);

8
source3/torture/utable.c
View File

@ -42,7 +42,7 @@ bool torture_utable(int dummy)
memset(valid, 0, sizeof(valid)); memset(valid, 0, sizeof(valid));
cli_mkdir(cli, "\\utable"); cli_mkdir(cli, "\\utable");
cli_unlink(cli, "\\utable\\*", aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, "\\utable\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
for (c=1; c < 0x10000; c++) { for (c=1; c < 0x10000; c++) {
size_t size = 0; size_t size = 0;
@ -77,7 +77,7 @@ bool torture_utable(int dummy)
} }
cli_close(cli, fnum); cli_close(cli, fnum);
cli_unlink(cli, fname, aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
if (c % 100 == 0) { if (c % 100 == 0) {
printf("%d (%d/%d)\r", c, chars_allowed, alt_allowed); printf("%d (%d/%d)\r", c, chars_allowed, alt_allowed);
@ -144,7 +144,7 @@ bool torture_casetable(int dummy)
memset(equiv, 0, sizeof(equiv)); memset(equiv, 0, sizeof(equiv));
cli_unlink(cli, "\\utable\\*", aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, "\\utable\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_rmdir(cli, "\\utable"); cli_rmdir(cli, "\\utable");
if (!NT_STATUS_IS_OK(cli_mkdir(cli, "\\utable"))) { if (!NT_STATUS_IS_OK(cli_mkdir(cli, "\\utable"))) {
printf("Failed to create utable directory!\n"); printf("Failed to create utable directory!\n");
@ -203,7 +203,7 @@ bool torture_casetable(int dummy)
cli_close(cli, fnum); cli_close(cli, fnum);
} }
cli_unlink(cli, "\\utable\\*", aSYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_unlink(cli, "\\utable\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
cli_rmdir(cli, "\\utable"); cli_rmdir(cli, "\\utable");
return True; return True;

2
source3/utils/net_rpc.c
View File

@ -3968,7 +3968,7 @@ static NTSTATUS rpc_share_migrate_files_internals(struct net_context *c,
cp_clistate.cli_share_src = NULL; cp_clistate.cli_share_src = NULL;
cp_clistate.cli_share_dst = NULL; cp_clistate.cli_share_dst = NULL;
cp_clistate.cwd = NULL; cp_clistate.cwd = NULL;
cp_clistate.attribute = aSYSTEM | FILE_ATTRIBUTE_HIDDEN | aDIR; cp_clistate.attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | aDIR;
cp_clistate.c = c; cp_clistate.c = c;
/* open share source */ /* open share source */