From d5dab2c660258dc6615d1b8a408a22795ef70819 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Apr 01 2020 13:02:26 +0000
Subject: PR#2106: kojira: Allow using Kerberos without krbV


Merges #2106
https://pagure.io/koji/pull-request/2106

Fixes #2114
https://pagure.io/koji/issue/2114

---

diff --git a/builder/kojid b/builder/kojid
index 847d93b..6872b08 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -6527,7 +6527,7 @@ if __name__ == "__main__":
         except socket.error as e:
             quit("Could not connect to Kerberos authentication service: '%s'" % e.args[1])
     else:
-        quit("No username/password supplied and Kerberos missing or not configured")
+        quit("No username/password/certificate supplied and Kerberos missing or not configured")
     # make session exclusive
     try:
         session.exclusiveSession(force=options.force_lock)
diff --git a/util/kojira b/util/kojira
index 4b99f12..26d3cbd 100755
--- a/util/kojira
+++ b/util/kojira
@@ -1031,8 +1031,10 @@ if __name__ == "__main__":
     elif options.user:
         # authenticate using user/password
         session.login()
-    elif koji.krbV and options.principal and options.keytab:
+    elif (koji.krbV or koji.requests_kerberos) and options.principal and options.keytab:
         session.krb_login(options.principal, options.keytab, options.ccache)
+    else:
+        quit("No username/password/certificate supplied and Kerberos missing or not configured")
     # get an exclusive session
     try:
         session.exclusiveSession(force=options.force_lock)