gp: Change root cert extension suffix
authorGabriel Nagy <gabriel.nagy@canonical.com>
Fri, 11 Aug 2023 15:46:42 +0000 (18:46 +0300)
committerJule Anger <janger@samba.org>
Mon, 15 Jan 2024 10:05:16 +0000 (10:05 +0000)
On Ubuntu, certificates must end in '.crt' in order to be considered by
the `update-ca-certificates` helper.

Signed-off-by: Gabriel Nagy <gabriel.nagy@canonical.com>
Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: David Mulder <dmulder@samba.org>
(cherry picked from commit bce3a89204545dcab5fb39a712590f6e166f997b)

python/samba/gp/gp_cert_auto_enroll_ext.py

index cefdafa21b2ab244e266ce6b70e609533276732e..c562722906b665319348e1d63e4668c3fada3cbc 100644 (file)
@@ -241,7 +241,8 @@ def getca(ca, url, trust_dir):
         certs = load_der_pkcs7_certificates(r.content)
         for i in range(0, len(certs)):
             cert = certs[i].public_bytes(Encoding.PEM)
-            dest = '%s.%d' % (root_cert, i)
+            filename, extension = root_cert.rsplit('.', 1)
+            dest = '%s.%d.%s' % (filename, i, extension)
             with open(dest, 'wb') as w:
                 w.write(cert)
             root_certs.append(dest)