author | Michael Krelin <hacker@klever.net> | 2007-12-09 22:10:49 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-12-09 22:10:49 (UTC) |
commit | 2e7bf3278c3e13baaa32c7ec8c2b3fdc4780a080 (patch) (unidiff) | |
tree | d36530a517425d2507df8e9550fbcc48fba48c5f /lib | |
parent | c34adc6e274c3dbb63af99ca566000e7d218244c (diff) | |
parent | 7a6a6fbcf7e20f0d7da5f625a73c865b361f16aa (diff) | |
download | libopkele-2e7bf3278c3e13baaa32c7ec8c2b3fdc4780a080.zip libopkele-2e7bf3278c3e13baaa32c7ec8c2b3fdc4780a080.tar.gz libopkele-2e7bf3278c3e13baaa32c7ec8c2b3fdc4780a080.tar.bz2 |
Merge branch 'next' into devel/xri
-rw-r--r-- | lib/consumer.cc | 6 | ||||
-rw-r--r-- | lib/util.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc index 66db7dd..9f7530f 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc | |||
@@ -186,4 +186,4 @@ namespace opkele { | |||
186 | assoc_t assoc = retrieve_assoc(server,pin.get_param("openid.assoc_handle")); | 186 | assoc_t assoc = retrieve_assoc(server,pin.get_param("openid.assoc_handle")); |
187 | if(assoc->is_expired()) /* TODO: or should I throw some other exception to force programmer fix his implementation? */ | 187 | if(assoc->is_expired()) |
188 | throw failed_lookup(OPKELE_CP_ "retrieve_assoc() has returned expired handle"); | 188 | throw id_res_expired_on_delivery(OPKELE_CP_ "retrieve_assoc() has returned expired handle"); |
189 | const string& sigenc = pin.get_param("openid.sig"); | 189 | const string& sigenc = pin.get_param("openid.sig"); |
@@ -216,3 +216,3 @@ namespace opkele { | |||
216 | throw id_res_mismatch(OPKELE_CP_ "signature mismatch"); | 216 | throw id_res_mismatch(OPKELE_CP_ "signature mismatch"); |
217 | }catch(failed_lookup& e) { /* XXX: more specific? */ | 217 | }catch(failed_lookup& e) { |
218 | const string& slist = pin.get_param("openid.signed"); | 218 | const string& slist = pin.get_param("openid.signed"); |
diff --git a/lib/util.cc b/lib/util.cc index 83f0eef..4600576 100644 --- a/lib/util.cc +++ b/lib/util.cc | |||
@@ -223,5 +223,5 @@ namespace opkele { | |||
223 | if( (port>0) && (port<65535) && port!=(s?443:80) ) { | 223 | if( (port>0) && (port<65535) && port!=(s?443:80) ) { |
224 | char tmp[6]; | 224 | char tmp[8]; |
225 | snprintf(tmp,sizeof(tmp),"%ld",port); | 225 | snprintf(tmp,sizeof(tmp),":%ld",port); |
226 | rv += ':'; rv += tmp; | 226 | rv += tmp; |
227 | } | 227 | } |