summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2008-04-06 09:09:34 (UTC)
committer Michael Krelin <hacker@klever.net>2008-04-06 09:09:34 (UTC)
commit3ad3ff71c4799ffd5f592fadb64feabac9e85b46 (patch) (unidiff)
tree8f11323de7dc782cbc0b644c92d857b1e401f70f
parenta9bb96d74c1337771bb4a9c1a4e78e2f2a73bbff (diff)
parent5d91c1f9eb443a13e36bb607d8c1b770e561888c (diff)
downloadlibopkele-3ad3ff71c4799ffd5f592fadb64feabac9e85b46.zip
libopkele-3ad3ff71c4799ffd5f592fadb64feabac9e85b46.tar.gz
libopkele-3ad3ff71c4799ffd5f592fadb64feabac9e85b46.tar.bz2
Merge commit 'devel/devel/oauth' into devel/oauth
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/basic_op.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/basic_op.cc b/lib/basic_op.cc
index fa659ac..511b51a 100644
--- a/lib/basic_op.cc
+++ b/lib/basic_op.cc
@@ -152,9 +152,13 @@ namespace opkele {
152 if(openid2) { 152 if(openid2) {
153 try { 153 try {
154 realm = inm.get_field("realm"); 154 realm = inm.get_field("realm");
155 if(realm.empty())
156 throw failed_lookup(OPKELE_CP_ "Empty realm doesn't count");
155 }catch(failed_lookup&) { 157 }catch(failed_lookup&) {
156 try { 158 try {
157 realm = inm.get_field("trust_root"); 159 realm = inm.get_field("trust_root");
160 if(realm.empty())
161 throw failed_lookup(OPKELE_CP_ "Empty trust_root doesn't count");
158 }catch(failed_lookup&) { 162 }catch(failed_lookup&) {
159 if(return_to.empty()) 163 if(return_to.empty())
160 throw bad_input(OPKELE_CP_ 164 throw bad_input(OPKELE_CP_
@@ -165,6 +169,8 @@ namespace opkele {
165 }else{ 169 }else{
166 try { 170 try {
167 realm = inm.get_field("trust_root"); 171 realm = inm.get_field("trust_root");
172 if(realm.empty())
173 throw failed_lookup(OPKELE_CP_ "Empty trust_root doesn't count");
168 }catch(failed_lookup&) { 174 }catch(failed_lookup&) {
169 if(return_to.empty()) 175 if(return_to.empty())
170 throw bad_input(OPKELE_CP_ 176 throw bad_input(OPKELE_CP_