I'm working on rebasing python-kerberos (PyKerberos) in rawhide and when upstream accepted our patch which added the ability to pass in flags to authGSSClientInit() they changed the ordering such that the IPA call will fail as it relies on positional arguments.

The fix is simple enough: use named arguments.

Still working on the rebase but this patch is obvious.

Target would be master branch only. I have no plans on updating python-kerberos in F22.

rob
>From 688b34ebebcd67acfbd5b2247a947bc4be74f968 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcrit...@redhat.com>
Date: Fri, 26 Jun 2015 15:48:09 +0000
Subject: [PATCH] Don't rely on positional arguments for python-kerberos calls

Upstream PyKerberos uses a different argument ordering than
from the patch that Fedora/RHEL was carrying for
authGSSClientInit().

Using named arguments provides forwards and backwards
compatibility.

https://fedorahosted.org/freeipa/ticket/5085
---
 ipalib/rpc.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ipalib/rpc.py b/ipalib/rpc.py
index 6a1c983c0419cf314e96c697a556825d679961c9..466b49a6dd60370db4d588389acba8dcaa493aa1 100644
--- a/ipalib/rpc.py
+++ b/ipalib/rpc.py
@@ -548,7 +548,8 @@ class KerbTransport(SSLTransport):
         service = "HTTP@" + host.split(':')[0]
 
         try:
-            (rc, vc) = kerberos.authGSSClientInit(service, self.flags)
+            (rc, vc) = kerberos.authGSSClientInit(service=service,
+                                                  gssflags=self.flags)
         except kerberos.GSSError, e:
             self._handle_exception(e)
 
-- 
2.1.0

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to