diff --git a/builder/kojid b/builder/kojid index 5149ce5b..ae3e16de 100755 --- a/builder/kojid +++ b/builder/kojid @@ -5782,7 +5782,7 @@ if __name__ == "__main__": quit("Error: Unable to log in. Bad credentials?") except xmlrpclib.ProtocolError: quit("Error: Unable to connect to server %s" % (options.server)) - elif krbV and 'krbV' in sys.modules: + elif krbV: krb_principal = options.krb_principal if krb_principal is None: krb_principal = options.host_principal_format % socket.getfqdn() diff --git a/util/koji-gc b/util/koji-gc index ae48648b..fa64f048 100755 --- a/util/koji-gc +++ b/util/koji-gc @@ -345,7 +345,7 @@ def ensure_connection(session): warn(_("WARNING: The server is at API version %d and the client is at %d" % (ret, koji.API_VERSION))) def has_krb_creds(): - if krbV is None or 'krbV' not in sys.modules: + if krbV is None: return False try: ctx = krbV.default_context() diff --git a/util/koji-shadow b/util/koji-shadow index d53f19d6..1bb18e54 100755 --- a/util/koji-shadow +++ b/util/koji-shadow @@ -320,7 +320,7 @@ def activate_session(session): elif options.user: #authenticate using user/password session.login() - elif krbV and 'krbV' in sys.modules: + elif krbV: try: if options.keytab and options.principal: session.krb_login(principal=options.principal, keytab=options.keytab, proxyuser=options.runas) diff --git a/vm/kojivmd b/vm/kojivmd index d2c1d9db..8bdbeedb 100755 --- a/vm/kojivmd +++ b/vm/kojivmd @@ -1099,7 +1099,7 @@ if __name__ == "__main__": quit("Error: Unable to log in. Bad credentials?") except xmlrpclib.ProtocolError: quit("Error: Unable to connect to server %s" % (options.server)) - elif krbV and 'krbV' in sys.modules: + elif krbV: krb_principal = options.krb_principal if krb_principal is None: krb_principal = options.host_principal_format % socket.getfqdn()