author | Michael Krelin <hacker@klever.net> | 2007-06-16 09:47:38 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-06-16 09:47:38 (UTC) |
commit | 2d4ea456085c67bdd0539c6b481f7561b5977b3e (patch) (side-by-side diff) | |
tree | 3e3592270f2b4c1cca735cc06a595b1d80019fa1 /lib | |
parent | bd27af85ae505a64cde56ab78b244505b4737cf0 (diff) | |
download | libopkele-2d4ea456085c67bdd0539c6b481f7561b5977b3e.zip libopkele-2d4ea456085c67bdd0539c6b481f7561b5977b3e.tar.gz libopkele-2d4ea456085c67bdd0539c6b481f7561b5977b3e.tar.bz2 |
remove catch-all nop handler
-rw-r--r-- | lib/consumer.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc index 30a5507..12866f0 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc @@ -137,24 +137,22 @@ namespace opkele { string iurl = canonicalize(identity); string server, delegate; retrieve_links(iurl,server,delegate); p["identity"] = delegate.empty()?iurl:delegate; if(!trust_root.empty()) p["trust_root"] = trust_root; p["return_to"] = return_to; try { - try { - string ah = find_assoc(server)->handle(); - p["assoc_handle"] = ah; - }catch(failed_lookup& fl) { - string ah = associate(server)->handle(); - p["assoc_handle"] = ah; - } - }catch(exception& e) { } + string ah = find_assoc(server)->handle(); + p["assoc_handle"] = ah; + }catch(failed_lookup& fl) { + string ah = associate(server)->handle(); + p["assoc_handle"] = ah; + } if(ext) ext->checkid_hook(p,identity); return p.append_query(server); } void consumer_t::id_res(const params_t& pin,const string& identity,extension_t *ext) { if(pin.has_param("openid.user_setup_url")) throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",pin.get_param("openid.user_setup_url")); string server,delegate; |