Commit ed748771 authored by Helga Velroyen's avatar Helga Velroyen
Browse files

Correct exception when ssconf file does not exist



After an upgrade to 2.11, the ssconf file for the master
certificates might not exist. Based on the non-existance,
noded falls back to a compatibility mode regarding dealing
with SSL certificates. The check for the ssconf file
caught the wrong exception, which resulted the fall-back
mechanism to fail.
Signed-off-by: default avatarHelga Velroyen <helgav@google.com>
Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
parent d4b81bdd
......@@ -1217,7 +1217,7 @@ def SSLVerifyPeer(conn, cert, errnum, errdepth, ok):
sstore = ssconf.SimpleStore()
try:
candidate_certs = sstore.GetMasterCandidatesCertMap()
except IOError:
except errors.ConfigurationError:
logging.info("No candidate certificates found. Switching to "
"bootstrap/update mode.")
candidate_certs = None
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment