diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-29 13:23:14 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-29 16:38:13 +1000 |
| commit | 0a3c84b554f3862b3e558f62e67ceb8311b248ce (patch) | |
| tree | acf760282a4bc495c69127ad38e22c06984e752c /source3/client | |
| parent | 317e19aeb3fbdb21573b6ef1bc8c2af646a7e61e (diff) | |
| download | samba-0a3c84b554f3862b3e558f62e67ceb8311b248ce.tar.gz samba-0a3c84b554f3862b3e558f62e67ceb8311b248ce.tar.bz2 samba-0a3c84b554f3862b3e558f62e67ceb8311b248ce.zip | |
s3-smb Use FILE_ATTRIBUTE_SYSTEM intead of aSYSTEM
This means we use just one constant for this file attribute.
Andrew Bartlett
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/client.c | 14 | ||||
| -rw-r--r-- | source3/client/clitar.c | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 7269f206f5..fed5b70bb1 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 | FILE_ATTRIBUTE_HIDDEN; + uint16 attribute = aDIR | FILE_ATTRIBUTE_SYSTEM | 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 | FILE_ATTRIBUTE_HIDDEN; + uint16 attribute = aDIR | FILE_ATTRIBUTE_SYSTEM | 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 | 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)) { return status; } @@ -1395,7 +1395,7 @@ static int cmd_more(void) static int cmd_mget(void) { TALLOC_CTX *ctx = talloc_tos(); - uint16 attribute = aSYSTEM | FILE_ATTRIBUTE_HIDDEN; + uint16 attribute = FILE_ATTRIBUTE_SYSTEM | 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 | FILE_ATTRIBUTE_HIDDEN); + status = cli_unlink(cli_state, mask, FILE_ATTRIBUTE_SYSTEM | 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 | FILE_ATTRIBUTE_HIDDEN; + uint16 attribute = FILE_ATTRIBUTE_SYSTEM | 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 | FILE_ATTRIBUTE_HIDDEN, + status = cli_list(targetcli, targetpath, aDIR | FILE_ATTRIBUTE_SYSTEM | 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 eba9915e2a..c389cfa776 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 | FILE_ATTRIBUTE_HIDDEN; +static uint16 attribute = aDIR | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; #ifndef CLIENT_TIMEOUT #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)) { DEBUG(4, ("skipping %s - archive bit not set\n", finfo.name)); 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)); shallitime=0; } else if (!tar_hidden && (finfo.mode & FILE_ATTRIBUTE_HIDDEN)) { @@ -1411,7 +1411,7 @@ int cmd_setmode(void) attra[direct]|=FILE_ATTRIBUTE_HIDDEN; break; case 's': - attra[direct]|=aSYSTEM; + attra[direct]|=FILE_ATTRIBUTE_SYSTEM; break; case 'a': attra[direct]|=aARCH; |