From fba5517b09722dc63364132113844c18e6209df4 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Dec 11 2017 10:07:02 +0000
Subject: Fix Koji kerberos login with keytab


---

diff --git a/odcs-unique-path.patch b/odcs-unique-path.patch
index e21b2e5..e713596 100644
--- a/odcs-unique-path.patch
+++ b/odcs-unique-path.patch
@@ -11,3 +11,28 @@ index 9dbd1d3..1d6d82d 100644
          """
          Create a unique path fragment by appending a path component
          to prefix.  The path component will consist of a string of letter and numbers
+diff --git a/server/odcs/server/utils.py b/server/odcs/server/utils.py
+index 20e2e50..96b1c5a 100644
+--- a/server/odcs/server/utils.py
++++ b/server/odcs/server/utils.py
+@@ -50,19 +50,7 @@ def make_koji_session():
+     log.info("Connecting to koji %r with %r." % (address, authtype))
+     koji_session = koji.ClientSession(address, opts=koji_config)
+     if authtype == "kerberos":
+-        ccache = getattr(conf, "krb_ccache", None)
+-        keytab = getattr(conf, "krb_keytab", None)
+-        principal = getattr(conf, "krb_principal", None)
+-        log.debug("  ccache: %r, keytab: %r, principal: %r" % (
+-            ccache, keytab, principal))
+-        if keytab and principal:
+-            koji_session.krb_login(
+-                principal=principal,
+-                keytab=keytab,
+-                ccache=ccache,
+-            )
+-        else:
+-            koji_session.krb_login(ccache=ccache)
++        koji_session.krb_login()
+     elif authtype == "ssl":
+         koji_session.ssl_login(
+             os.path.expanduser(koji_config.cert),
diff --git a/odcs.spec b/odcs.spec
index 98e50f8..501d087 100644
--- a/odcs.spec
+++ b/odcs.spec
@@ -4,7 +4,7 @@
 
 Name:       odcs
 Version:    0.1.5
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    The On Demand Compose Service
 
 
@@ -265,6 +265,9 @@ exit 0
 
 
 %changelog
+* Mon Dec 11 2017 Jan Kaluza <jkaluza@redhat.com> - 0.1.5-3
+- fix Koji kerberos login with keytab
+
 * Mon Dec 11 2017 Jan Kaluza <jkaluza@redhat.com> - 0.1.5-2
 - fix traceback in unique_path.