]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
gpo: Fix up rsop output of ca certificate
authorDavid Mulder <dmulder@suse.com>
Mon, 28 Jun 2021 15:06:09 +0000 (09:06 -0600)
committerJeremy Allison <jra@samba.org>
Thu, 15 Jul 2021 19:13:29 +0000 (19:13 +0000)
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
python/samba/gpclass.py

index 7d3841ba8da035fcd01879818fe0e9539f7bae34..6879719847f93cbf282adfe4001fd221dde3f2f4 100644 (file)
@@ -500,10 +500,10 @@ def __rsop_vals(vals, level=4):
     if type(vals) == dict:
         ret = [' '*level + '[ %s ] = %s' % (k, __rsop_vals(v, level+2))
                 for k, v in vals.items()]
-        return '\n'.join(ret)
+        return '\n' + '\n'.join(ret)
     elif type(vals) == list:
         ret = [' '*level + '[ %s ]' % __rsop_vals(v, level+2) for v in vals]
-        return '\n'.join(ret)
+        return '\n' + '\n'.join(ret)
     else:
         return vals
 
@@ -532,7 +532,7 @@ def rsop(lp, creds, logger, store, gp_extensions, target):
             for section, settings in ext.rsop(gpo).items():
                 print('    Policy Type: %s' % section)
                 print('    ' + ('-'*int(term_width/2)))
-                print(__rsop_vals(settings))
+                print(__rsop_vals(settings).lstrip('\n'))
                 print('    ' + ('-'*int(term_width/2)))
             print('  ' + ('-'*int(term_width/2)))
         print('%s\n' % ('='*term_width))