diff options
| -rwxr-xr-x | client/ipa-client-install | 2 | ||||
| -rw-r--r-- | ipalib/util.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/client/ipa-client-install b/client/ipa-client-install index 1e6112445..44ddeb956 100755 --- a/client/ipa-client-install +++ b/client/ipa-client-install @@ -1798,7 +1798,7 @@ def update_ssh_keys(server, hostname, ssh_dir, create_sshfp): continue try: pubkey = SSHPublicKey(line) - except ValueError as UnicodeDecodeError: + except (ValueError, UnicodeDecodeError): continue root_logger.info("Adding SSH public key from %s", filename) pubkeys.append(pubkey) diff --git a/ipalib/util.py b/ipalib/util.py index 6c70fbdfc..262acf926 100644 --- a/ipalib/util.py +++ b/ipalib/util.py @@ -278,13 +278,13 @@ def normalize_sshpubkey(value): def validate_sshpubkey(ugettext, value): try: SSHPublicKey(value) - except ValueError as UnicodeDecodeError: + except (ValueError, UnicodeDecodeError): return _('invalid SSH public key') def validate_sshpubkey_no_options(ugettext, value): try: pubkey = SSHPublicKey(value) - except ValueError as UnicodeDecodeError: + except (ValueError, UnicodeDecodeError): return _('invalid SSH public key') if pubkey.has_options(): @@ -304,7 +304,7 @@ def convert_sshpubkey_post(ldap, dn, entry_attrs): for pubkey in pubkeys: try: pubkey = SSHPublicKey(pubkey) - except ValueError as UnicodeDecodeError: + except (ValueError, UnicodeDecodeError): continue fp = pubkey.fingerprint_hex_md5() |