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

check krb_principal before it is rewritten

Browse source
This commit is contained in:
Tomas Kopecek 2020-03-24 12:14:57 +01:00
parent 226f9d8fbe
commit eae8df718f
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hub/kojihub.py
View file

@ -12175,10 +12175,6 @@ class RootExports(object):
raise koji.GenericError('host already exists: %s' % hostname)
q = """SELECT id FROM channels WHERE name = 'default'"""
default_channel = _singleValue(q)
if krb_principal is None:
fmt = context.opts.get('HostPrincipalFormat')
if fmt:
krb_principal = fmt % hostname
# builder user can already exist, if host tried to log in before adding into db
userinfo = {'name': hostname}
if krb_principal:
@ -12198,6 +12194,10 @@ class RootExports(object):
'user %s already exists and it is not a host' % hostname)
userID = user['id']
else:
if krb_principal is None:
fmt = context.opts.get('HostPrincipalFormat')
if fmt:
krb_principal = fmt % hostname
userID = context.session.createUser(hostname, usertype=koji.USERTYPES['HOST'],
krb_principal=krb_principal)
# host entry