remove catch-all nop handler

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
@@ -133,32 +133,30 @@ namespace opkele {
 	else if(mode==mode_checkid_setup)
 	    p["mode"]="checkid_setup";
 	else
 	    throw bad_input(OPKELE_CP_ "unknown checkid_* mode");
 	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;
 	retrieve_links(identity.empty()?pin.get_param("openid.identity"):canonicalize(identity),server,delegate);
 	params_t ps;
 	try {
 	    assoc_t assoc = retrieve_assoc(server,pin.get_param("openid.assoc_handle"));