summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2007-06-16 09:47:38 (UTC)
committer Michael Krelin <hacker@klever.net>2007-06-16 09:47:38 (UTC)
commit2d4ea456085c67bdd0539c6b481f7561b5977b3e (patch) (unidiff)
tree3e3592270f2b4c1cca735cc06a595b1d80019fa1
parentbd27af85ae505a64cde56ab78b244505b4737cf0 (diff)
downloadlibopkele-2d4ea456085c67bdd0539c6b481f7561b5977b3e.zip
libopkele-2d4ea456085c67bdd0539c6b481f7561b5977b3e.tar.gz
libopkele-2d4ea456085c67bdd0539c6b481f7561b5977b3e.tar.bz2
remove catch-all nop handler
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/consumer.cc14
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
@@ -139,20 +139,18 @@ namespace opkele {
139 retrieve_links(iurl,server,delegate); 139 retrieve_links(iurl,server,delegate);
140 p["identity"] = delegate.empty()?iurl:delegate; 140 p["identity"] = delegate.empty()?iurl:delegate;
141 if(!trust_root.empty()) 141 if(!trust_root.empty())
142 p["trust_root"] = trust_root; 142 p["trust_root"] = trust_root;
143 p["return_to"] = return_to; 143 p["return_to"] = return_to;
144 try { 144 try {
145 try { 145 string ah = find_assoc(server)->handle();
146 string ah = find_assoc(server)->handle(); 146 p["assoc_handle"] = ah;
147 p["assoc_handle"] = ah; 147 }catch(failed_lookup& fl) {
148 }catch(failed_lookup& fl) { 148 string ah = associate(server)->handle();
149 string ah = associate(server)->handle(); 149 p["assoc_handle"] = ah;
150 p["assoc_handle"] = ah; 150 }
151 }
152 }catch(exception& e) { }
153 if(ext) ext->checkid_hook(p,identity); 151 if(ext) ext->checkid_hook(p,identity);
154 return p.append_query(server); 152 return p.append_query(server);
155 } 153 }
156 154
157 void consumer_t::id_res(const params_t& pin,const string& identity,extension_t *ext) { 155 void consumer_t::id_res(const params_t& pin,const string& identity,extension_t *ext) {
158 if(pin.has_param("openid.user_setup_url")) 156 if(pin.has_param("openid.user_setup_url"))