diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-29 11:57:02 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-29 16:38:13 +1000 |
| commit | 0eca33bbf620678759bbe39efaa74f33f96efb74 (patch) | |
| tree | 69f8d8cff78cdcd8ee93280d9b88563bc7331cf3 /source3/utils | |
| parent | 08c90d6f2df85499f43c5766a62839e80437290f (diff) | |
| download | samba-0eca33bbf620678759bbe39efaa74f33f96efb74.tar.gz samba-0eca33bbf620678759bbe39efaa74f33f96efb74.tar.bz2 samba-0eca33bbf620678759bbe39efaa74f33f96efb74.zip | |
s3-smb Use FILE_ATTRIBUTE_DIRECTORY intead of aDIR
This means we use just one constant for this file attribute.
Andrew Bartlett
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_rpc.c | 4 | ||||
| -rw-r--r-- | source3/utils/smbcacls.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 6f9ef8c107..a3657262c4 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -3730,7 +3730,7 @@ static NTSTATUS copy_fn(const char *mnt, struct file_info *f, DEBUG(3,("got mask: %s, name: %s\n", mask, f->name)); /* DIRECTORY */ - if (f->mode & aDIR) { + if (f->mode & FILE_ATTRIBUTE_DIRECTORY) { DEBUG(3,("got dir: %s\n", f->name)); @@ -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_dst = NULL; cp_clistate.cwd = NULL; - cp_clistate.attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | aDIR; + cp_clistate.attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY; cp_clistate.c = c; /* open share source */ diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index 45b4163c96..efadaee4c6 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -1044,7 +1044,7 @@ static int inherit(struct cli_state *cli, const char *filename, /* Add inherited flag to all aces */ ace->flags=ace->flags| SEC_ACE_FLAG_INHERITED_ACE; - if ((oldattr & aDIR) == aDIR) { + if ((oldattr & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY) { if ((ace->flags & SEC_ACE_FLAG_CONTAINER_INHERIT) == SEC_ACE_FLAG_CONTAINER_INHERIT) { add_ace(&old->dacl, ace); |