PEP8: fix E115: expected an indented block (comment)
authorJoe Guo <joeg@catalyst.net.nz>
Mon, 30 Jul 2018 06:14:00 +0000 (18:14 +1200)
committerDouglas Bagnall <dbagnall@samba.org>
Fri, 24 Aug 2018 05:49:26 +0000 (07:49 +0200)
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>
python/samba/ntacls.py
source3/build/charset.py

index 32ceb54fd1b63c09f682279e5172ca489e35ffcd..115e555de16b20ac9910a5be894a287e6ca1bc61 100644 (file)
@@ -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
index a800eeee447668521809930bd0aa403734a9dcb0..75981379577eff2972243d481a4dd74ea926d672 100644 (file)
@@ -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"