diff options
| author | Joe Guo <joeg@catalyst.net.nz> | 2018-07-30 18:14:00 +1200 |
|---|---|---|
| committer | Douglas Bagnall <dbagnall@samba.org> | 2018-08-24 07:49:26 +0200 |
| commit | eba81f7fa92ec807da6a78976fc3105157f592a4 (patch) | |
| tree | a64af44f4460ce81a8d088ff794b6754c0ce5ff7 | |
| parent | 4fc08d8f14e281fb7492d5a196e456637406c514 (diff) | |
| download | samba-eba81f7fa92ec807da6a78976fc3105157f592a4.tar.gz | |
PEP8: fix E115: expected an indented block (comment)
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
| -rw-r--r-- | python/samba/ntacls.py | 2 | ||||
| -rw-r--r-- | source3/build/charset.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/python/samba/ntacls.py b/python/samba/ntacls.py index 32ceb54fd1b..115e555de16 100644 --- a/python/samba/ntacls.py +++ b/python/samba/ntacls.py @@ -290,7 +290,7 @@ def dsacl2fsacl(dssddl, sid, as_sddl=True): for i in range(0, len(aces)): ace = aces[i] if not ace.type & security.SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT and str(ace.trustee) != security.SID_BUILTIN_PREW2K: - # if fdescr.type & security.SEC_DESC_DACL_AUTO_INHERITED: + # if fdescr.type & security.SEC_DESC_DACL_AUTO_INHERITED: ace.flags = ace.flags | security.SEC_ACE_FLAG_OBJECT_INHERIT | security.SEC_ACE_FLAG_CONTAINER_INHERIT if str(ace.trustee) == security.SID_CREATOR_OWNER: # For Creator/Owner the IO flag is set as this ACE has only a sense for child objects diff --git a/source3/build/charset.py b/source3/build/charset.py index a800eeee447..75981379577 100644 --- a/source3/build/charset.py +++ b/source3/build/charset.py @@ -34,7 +34,7 @@ def CHECK_SAMBA3_CHARSET(conf, crossbuild=False): # TODO: this used to warn about the set charset on cross builds if default_dos_charset is False or default_unix_charset is False: - # we found iconv, but it failed to convert anything (e.g. on AIX) + # we found iconv, but it failed to convert anything (e.g. on AIX) conf.undefine('HAVE_NATIVE_ICONV'); default_dos_charset = "ASCII" default_unix_charset = "UTF-8" |