git.samba.org
/
nivanova
/
samba-autobuild
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
python/ntacls: Convert ntacls to use s3 flags
[nivanova/samba-autobuild/.git]
/
python
/
samba
/
ntacls.py
diff --git
a/python/samba/ntacls.py
b/python/samba/ntacls.py
index 6ac5a3871a8efdb930d7f1dcbda4ac626e8b71fb..1ab5fd36e15c68f709136a06abd3babc170f9b23 100644
(file)
--- a/
python/samba/ntacls.py
+++ b/
python/samba/ntacls.py
@@
-32,13
+32,13
@@
from samba.samba3 import param as s3param
from samba.dcerpc import security, xattr, idmap
from samba.ndr import ndr_pack, ndr_unpack
from samba.samba3 import smbd
from samba.dcerpc import security, xattr, idmap
from samba.ndr import ndr_pack, ndr_unpack
from samba.samba3 import smbd
-from samba
import
smb
+from samba
.samba3 import lib
smb
# don't include volumes
# don't include volumes
-SMB_FILE_ATTRIBUTE_FLAGS = smb.FILE_ATTRIBUTE_SYSTEM | \
- smb.FILE_ATTRIBUTE_DIRECTORY | \
- smb.FILE_ATTRIBUTE_ARCHIVE | \
- smb.FILE_ATTRIBUTE_HIDDEN
+SMB_FILE_ATTRIBUTE_FLAGS =
lib
smb.FILE_ATTRIBUTE_SYSTEM | \
+
lib
smb.FILE_ATTRIBUTE_DIRECTORY | \
+
lib
smb.FILE_ATTRIBUTE_ARCHIVE | \
+
lib
smb.FILE_ATTRIBUTE_HIDDEN
SECURITY_SECINFO_FLAGS = security.SECINFO_OWNER | \
SECURITY_SECINFO_FLAGS = security.SECINFO_OWNER | \
@@
-348,7
+348,7
@@
class SMBHelper:
attrib is from list method.
"""
attrib is from list method.
"""
- return bool(attrib & smb.FILE_ATTRIBUTE_DIRECTORY)
+ return bool(attrib &
lib
smb.FILE_ATTRIBUTE_DIRECTORY)
def join(self, root, name):
"""
def join(self, root, name):
"""