Do not show full SSH public keys in command output by default.

This commit is contained in:
Jan Cholasta
2012-10-11 04:26:56 -04:00
committed by Martin Kosek
parent f1ce31486c
commit a51b65d9d4

View File

@@ -296,7 +296,7 @@ def validate_sshpubkey_no_options(ugettext, value):
def convert_sshpubkey_post(ldap, dn, entry_attrs):
if 'ipasshpubkey' in entry_attrs:
pubkeys = entry_attrs.pop('ipasshpubkey')
pubkeys = entry_attrs['ipasshpubkey']
else:
old_entry_attrs = ldap.get_entry(dn, ['ipasshpubkey'])
pubkeys = old_entry_attrs[1].get('ipasshpubkey')
@@ -320,8 +320,8 @@ def convert_sshpubkey_post(ldap, dn, entry_attrs):
newpubkeys.append(pubkey.openssh())
fingerprints.append(fp)
if newpubkeys:
entry_attrs['ipasshpubkey'] = newpubkeys
if 'ipasshpubkey' in entry_attrs:
entry_attrs['ipasshpubkey'] = newpubkeys or None
if fingerprints:
entry_attrs['sshpubkeyfp'] = fingerprints