gpo: Improve Certificate Auto Enroll Debug messages

Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Apr  5 01:44:33 UTC 2022 on sn-devel-184

diff --git a/python/samba/gp_cert_auto_enroll_ext.py b/python/samba/gp_cert_auto_enroll_ext.py
index 061d2c06c20470bdcfac89798abe1e23adf78e2e..e5c2f2e43945edb6a4449d08a2a1dfcba775ec20 100644 (file)
--- a/python/samba/gp_cert_auto_enroll_ext.py
+++ b/python/samba/gp_cert_auto_enroll_ext.py
@@ -86,8 +86,8 @@ def get_supported_templates(server):
                        env=env, stdout=PIPE, stderr=PIPE)
         out, err = p.communicate()
         if p.returncode != 0:
-            log.warn('Failed to fetch the list of supported templates.')
-            log.debug(err.decode())
+            data = { 'Error': err.decode() }
+            log.error('Failed to fetch the list of supported templates.', data)
         return out.strip().split()
     return []
 
@@ -142,7 +142,8 @@ def cert_enroll(ca, trust_dir, private_dir):
         out, err = p.communicate()
         log.debug(out.decode())
         if p.returncode != 0:
-            log.debug(err.decode())
+            data = { 'Error': err.decode(), 'CA': ca['cn'][0] }
+            log.error('Failed to add Certificate Authority', data)
         supported_templates = get_supported_templates(ca['dNSHostName'][0])
         for template, attrs in ca['certificateTemplates'].items():
             if template not in supported_templates:
@@ -158,7 +159,8 @@ def cert_enroll(ca, trust_dir, private_dir):
             out, err = p.communicate()
             log.debug(out.decode())
             if p.returncode != 0:
-                log.debug(err.decode())
+                data = { 'Error': err.decode(), 'Certificate': nickname }
+                log.error('Failed to request certificate', data)
             data['files'].extend([keyfile, certfile])
             data['templates'].append(nickname)
         if update is not None: