IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipa-server-upgrade: fix add_systemd_user_hbac

Browse Source 
During upgrade, the method add_systemd_user_hbac is creating
a hbacsvc and a hbacrule, but fails in python2 because of
unicode conversion errors.
The arguments should be defined as u'value'.

Fixes: https://pagure.io/freeipa/issue/7896
Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Florence Blanc-Renaud 2019-04-01 11:10:26 +02:00 committed by Christian Heimes
parent ffcbb83508
commit d60122f9fb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ipaserver/install/server/upgrade.py
View File

@ -1739,12 +1739,12 @@ def migrate_to_authselect():
def add_systemd_user_hbac(): def add_systemd_user_hbac():
logger.info('[Create systemd-user hbac service and rule]') logger.info('[Create systemd-user hbac service and rule]')
rule = 'allow_systemd-user' rule = u'allow_systemd-user'
service = 'systemd-user' service = u'systemd-user'
try: try:
api.Command.hbacsvc_add( api.Command.hbacsvc_add(
service, service,
description='pam_systemd and systemd user@.service' description=u'pam_systemd and systemd user@.service'
) )
except ipalib.errors.DuplicateEntry: except ipalib.errors.DuplicateEntry:
logger.info('hbac service %s already exists', service) logger.info('hbac service %s already exists', service)
@ -1757,10 +1757,10 @@ def add_systemd_user_hbac():
try: try:
api.Command.hbacrule_add( api.Command.hbacrule_add(
rule, rule,
description=('Allow pam_systemd to run user@.service to create ' description=(u'Allow pam_systemd to run user@.service to create '
'a system user session'), 'a system user session'),
usercategory='all', usercategory=u'all',
hostcategory='all', hostcategory=u'all',
) )
except ipalib.errors.DuplicateEntry: except ipalib.errors.DuplicateEntry:
logger.info('hbac rule %s already exists', rule) logger.info('hbac rule %s already exists', rule)