From 6c1d0bfae92fea3ed42e73988f6d0d8a4274bbf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauri=20V=C3=B5sandi?= <lauri.vosandi@gmail.com>
Date: Mon, 30 Jan 2017 18:12:27 +0000
Subject: [PATCH] More fixes to make client work on Mac OS X

---
 certidude/helpers.py | 8 ++++----
 requirements.txt     | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/certidude/helpers.py b/certidude/helpers.py
index 15a5bf9..f023376 100644
--- a/certidude/helpers.py
+++ b/certidude/helpers.py
@@ -4,7 +4,7 @@ import os
 import requests
 import subprocess
 import tempfile
-from certidude import errors
+from certidude import errors, const
 from certidude.wrappers import Certificate, Request
 from cryptography import x509
 from cryptography.hazmat.primitives.asymmetric import rsa
@@ -188,10 +188,10 @@ def certidude_request_certificate(server, key_path, request_path, certificate_pa
             cp = ConfigParser(delimiters=("="))
             cp.readfp(open("/etc/samba/smb.conf"))
             name = cp.get("global", "netbios name")
-            os.system("kinit -S HTTP/%s -k %s$" % (name, server))
+            os.system("kinit -S HTTP/%s -k %s$" % (server, name))
         else:
-            os.system("kinit -S HTTP/%s -k %s$" % (const.HOSTNAME.lower(), server) # Mac OS X
-            os.system("kinit -S HTTP/%s -k %s$" % (const.HOSTNAME.upper(), server) # Fedora /w SSSD
+            os.system("kinit -S HTTP/%s -k %s$" % (server, const.HOSTNAME.lower())) # Mac OS X
+            os.system("kinit -S HTTP/%s -k %s$" % (server, const.HOSTNAME.upper())) # Fedora /w SSSD
         from requests_kerberos import HTTPKerberosAuth, OPTIONAL
         auth = HTTPKerberosAuth(mutual_authentication=OPTIONAL, force_preemptive=True)
     else:
diff --git a/requirements.txt b/requirements.txt
index d4b8b3d..58c9359 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,11 +14,9 @@ MarkupSafe==0.23
 ndg-httpsclient==0.4.2
 pyasn1==0.1.9
 pycparser==2.14
-pyOpenSSL==16.0.0
 python-ldap==2.4.25
 python-mimeparse==1.5.2
 requests==2.10.0
 setproctitle==1.1.10
-six==1.10.0
 urllib3==1.16
 wsgiref==0.1.2