From: David Mulder Date: Mon, 28 Jun 2021 15:06:09 +0000 (-0600) Subject: gpo: Fix up rsop output of ca certificate X-Git-Tag: tdb-1.4.5~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f0e6f3c0631fdd8bd9580db382d00c2ea4f3c57;p=thirdparty%2Fsamba.git gpo: Fix up rsop output of ca certificate Signed-off-by: David Mulder Reviewed-by: Jeremy Allison --- diff --git a/python/samba/gpclass.py b/python/samba/gpclass.py index 7d3841ba8da..6879719847f 100644 --- a/python/samba/gpclass.py +++ b/python/samba/gpclass.py @@ -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))