From d76dabf12c37cdb881329c8537afdd949b63a02a Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Oct 18 2021 11:14:01 +0000
Subject: Merge #57 `koji-ssl-admin: add uid attribute to user certificates`


---

diff --git a/src/bin/koji-ssl-admin b/src/bin/koji-ssl-admin
index 5c7b459..aff30f5 100755
--- a/src/bin/koji-ssl-admin
+++ b/src/bin/koji-ssl-admin
@@ -143,9 +143,10 @@ def generate_user_csr(key, path, username, force=False):
     if os.path.exists(path) and not force:
         raise OSError(errno.EEXIST, os.strerror(errno.EEXIST), path)
     builder = x509.CertificateSigningRequestBuilder()
-    # Build the basic cert with the simple common name:
+    # Build the basic cert with the "common name" and "uid" attributes:
     subject_name = x509.Name([
         x509.NameAttribute(NameOID.COMMON_NAME, username),
+        x509.NameAttribute(NameOID.USER_ID, username),
     ])
     builder = builder.subject_name(subject_name)
     # This is not a CA: