particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean up httpd options handling in a couple places

Browse source
This commit is contained in:
Mike Bonnet 2007-03-19 13:29:42 -04:00
parent 6578e852a8
commit 4f100047eb
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
koji/auth.py
View file

@ -249,8 +249,8 @@ class Session(object):
raise koji.AuthError, "Already logged in"
ctx = krbV.default_context()
srvprinc = krbV.Principal(name=context.req.get_options()['AuthPrincipal'], context=ctx)
srvkt = krbV.Keytab(name=context.req.get_options()['AuthKeytab'], context=ctx)
srvprinc = krbV.Principal(name=context.opts['AuthPrincipal'], context=ctx)
srvkt = krbV.Keytab(name=context.opts['AuthKeytab'], context=ctx)
ac = krbV.AuthContext(context=ctx)
ac.flags = krbV.KRB5_AUTH_CONTEXT_DO_SEQUENCE|krbV.KRB5_AUTH_CONTEXT_DO_TIME
@ -266,7 +266,7 @@ class Session(object):
# Successfully authenticated via Kerberos, now log in
if proxyuser:
proxyprincs = [princ.strip() for princ in context.req.get_options()['ProxyPrincipals'].split(',')]
proxyprincs = [princ.strip() for princ in context.opts['ProxyPrincipals'].split(',')]
if cprinc.name in proxyprincs:
login_principal = proxyuser
else: