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

adtrust: avoid using timestamp in klist output

Browse Source 
When parsing a keytab to copy keys to a different keytab, we don't need
the timestamp, so don't ask klist to output it. In some locales (en_IN,
for example), the timestamp is output in a single field without a space
between date and time. In other locales it can be represented with date
and time separated by a space.

Fixes: https://pagure.io/freeipa/issue/8066
Reviewed-By: Thomas Woerner <twoerner@redhat.com>
This commit is contained in:
Alexander Bokovoy 2019-09-09 11:02:29 +03:00
parent 8ce0e6bf60
commit 80e4c18b75
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipaserver/install/plugins/adtrust.py
View File

@ -721,7 +721,7 @@ class update_tdo_to_new_layout(Updater):
KeyEntry = namedtuple('KeyEntry',
['kvno', 'date', 'time', 'principal', 'etype', 'key'])
['kvno', 'principal', 'etype', 'key'])
@register()
@ -741,7 +741,7 @@ class update_host_cifs_keytabs(Updater):
def extract_key_refs(self, keytab):
host_princ = self.host_princ_template.format(
master=self.api.env.host, realm=self.api.env.realm)
result = ipautil.run([paths.KLIST, "-etK", "-k", keytab],
result = ipautil.run([paths.KLIST, "-eK", "-k", keytab],
capture_output=True, raiseonerr=False,
nolog_output=True)
if result.returncode != 0:
@ -752,8 +752,8 @@ class update_host_cifs_keytabs(Updater):
if (host_princ in l and any(e in l for e in self.valid_etypes)):
els = l.split()
els[4] = els[4].strip('()')
els[5] = els[5].strip('()')
els[-2] = els[-2].strip('()')
els[-1] = els[-1].strip('()')
keys_to_sync.append(KeyEntry._make(els))
return keys_to_sync