diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-29 12:00:57 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-29 16:38:13 +1000 |
| commit | 0520da2bbe246c45d89bfdec0d399862ecb867ba (patch) | |
| tree | 7789cb1fdf01844b6b27efa33e370354eb4d2735 /source3/client | |
| parent | 0eca33bbf620678759bbe39efaa74f33f96efb74 (diff) | |
| download | samba-0520da2bbe246c45d89bfdec0d399862ecb867ba.tar.gz samba-0520da2bbe246c45d89bfdec0d399862ecb867ba.tar.bz2 samba-0520da2bbe246c45d89bfdec0d399862ecb867ba.zip | |
s3-smb Use FILE_ATTRIBUTE_ARCHIVE intead of aARCH
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 | 6 | ||||
| -rw-r--r-- | source3/client/clitar.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index dadaf44394..4c90716c48 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -520,7 +520,7 @@ static bool do_this_one(struct file_info *finfo) return false; } - if ((archive_level==1 || archive_level==2) && !(finfo->mode & aARCH)) { + if ((archive_level==1 || archive_level==2) && !(finfo->mode & FILE_ATTRIBUTE_ARCHIVE)) { DEBUG(3,("archive %s failed\n", finfo->name)); return false; } @@ -1147,8 +1147,8 @@ static int do_get(const char *rname, const char *lname_in, bool reget) close(handle); } - if (archive_level >= 2 && (attr & aARCH)) { - cli_setatr(cli, rname, attr & ~(uint16)aARCH, 0); + if (archive_level >= 2 && (attr & FILE_ATTRIBUTE_ARCHIVE)) { + cli_setatr(cli, rname, attr & ~(uint16)FILE_ATTRIBUTE_ARCHIVE, 0); } { diff --git a/source3/client/clitar.c b/source3/client/clitar.c index ebda5af5e3..289e57801b 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -686,7 +686,7 @@ static NTSTATUS do_atar(const char *rname_in, char *lname, DEBUG(3,("file %s attrib 0x%X\n",finfo.name,finfo.mode)); - if (tar_inc && !(finfo.mode & aARCH)) { + if (tar_inc && !(finfo.mode & FILE_ATTRIBUTE_ARCHIVE)) { DEBUG(4, ("skipping %s - archive bit not set\n", finfo.name)); shallitime=0; } else if (!tar_system && (finfo.mode & FILE_ATTRIBUTE_SYSTEM)) { @@ -784,7 +784,7 @@ static NTSTATUS do_atar(const char *rname_in, char *lname, /* if shallitime is true then we didn't skip */ if (tar_reset && !dry_run) - (void) do_setrattr(finfo.name, aARCH, ATTRRESET); + (void) do_setrattr(finfo.name, FILE_ATTRIBUTE_ARCHIVE, ATTRRESET); clock_gettime_mono(&tp_end); this_time = (tp_end.tv_sec - tp_start.tv_sec)*1000 + (tp_end.tv_nsec - tp_start.tv_nsec)/1000000; @@ -1414,7 +1414,7 @@ int cmd_setmode(void) attra[direct]|=FILE_ATTRIBUTE_SYSTEM; break; case 'a': - attra[direct]|=aARCH; + attra[direct]|=FILE_ATTRIBUTE_ARCHIVE; break; default: DEBUG(0, ("setmode <filename> <perm=[+|-]rsha>\n")); |