Author: croberts Date: 2012-12-10 20:53:37 +0000 (Mon, 10 Dec 2012) New Revision: 5573

Modified: branches/elephant/cumin/bin/cumin-web branches/elephant/cumin/python/cumin/config.py branches/elephant/cumin/python/cumin/kerbauth.py Log: Bringing a few changes from trunk over to prevent startup login errors.

Modified: branches/elephant/cumin/bin/cumin-web =================================================================== --- branches/elephant/cumin/bin/cumin-web 2012-12-10 19:46:56 UTC (rev 5572) +++ branches/elephant/cumin/bin/cumin-web 2012-12-10 20:53:37 UTC (rev 5573) @@ -71,7 +71,6 @@ cumin.ldap_tls_cacertfile = values.ldap_tls_cacertfile

def set_kerberos_configs(cumin, values): - cumin.kerberos_server = values.kerberos_server cumin.kerberos_realm = values.kerberos_realm

def check_cert_files(opts):

Modified: branches/elephant/cumin/python/cumin/config.py =================================================================== --- branches/elephant/cumin/python/cumin/config.py 2012-12-10 19:46:56 UTC (rev 5572) +++ branches/elephant/cumin/python/cumin/config.py 2012-12-10 20:53:37 UTC (rev 5573) @@ -141,10 +141,7 @@

param = ConfigParameter(self, "ldap_timeout", int) param.default = 30 - - param = ConfigParameter(self, "kerberos_server", str) - param.default = "" - + param = ConfigParameter(self, "kerberos_realm", str) param.default = ""

Modified: branches/elephant/cumin/python/cumin/kerbauth.py =================================================================== --- branches/elephant/cumin/python/cumin/kerbauth.py 2012-12-10 19:46:56 UTC (rev 5572) +++ branches/elephant/cumin/python/cumin/kerbauth.py 2012-12-10 20:53:37 UTC (rev 5573) @@ -11,10 +11,8 @@ class CuminAuthenticatorKerberos(object): def __init__(self, mech, app): log.info("Initializing %s", self) - self.kerb_url = app.kerberos_server self.kerb_realm = app.kerberos_realm - if (self.kerb_url is not None and self.kerb_realm is not None - and self.kerb_url is not "" and self.kerb_realm is not ""): + if (self.kerb_realm is not None and self.kerb_realm is not ""): self.valid = True else: self.valid = False @@ -25,7 +23,7 @@ isAuth = False if self.valid: try: - isAuth = kerberos.checkPassword(username, password, self.kerb_url, self.kerb_realm) + isAuth = kerberos.checkPassword(username, password, "HTTP", self.kerb_realm) except Exception, e: log.debug("Auth failed %s" % e) else: @@ -34,4 +32,7 @@

@staticmethod def isKerbAvail(): - return have_kerberos \ No newline at end of file + return have_kerberos + + def find_user(self, user): + pass \ No newline at end of file