From 524e8579d06f61fa7d001f64888b97ecbd469199 Mon Sep 17 00:00:00 2001 From: Carson Lam Date: Tue, 17 May 2016 13:28:51 -0700 Subject: [PATCH] Refactor kerberos-sspi and principal handling. --- requests_kerberos/kerberos_.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requests_kerberos/kerberos_.py b/requests_kerberos/kerberos_.py index 8d87934..87d8f96 100644 --- a/requests_kerberos/kerberos_.py +++ b/requests_kerberos/kerberos_.py @@ -122,12 +122,12 @@ class HTTPKerberosAuth(AuthBase): kerb_host = self.hostname_override if self.hostname_override is not None else host kerb_spn = "{0}@{1}".format(self.service, kerb_host) - kwargs = {'principal': self.principal} + kwargs = {} # kerberos-sspi: Never pass principal. Raise if user tries to specify one. - if self._using_kerberos_sspi: - kwargs = {} - if self.principal: - raise NotImplementedError("Can't use 'principal' argument with kerberos-sspi.") + if not self._using_kerberos_sspi: + kwargs['principal'] = self.principal + elif self.principal: + raise NotImplementedError("Can't use 'principal' argument with kerberos-sspi.") result, self.context[host] = kerberos.authGSSClientInit(kerb_spn, gssflags=gssflags, **kwargs)