From 39deac2549defa7b5523c49abf91c38a39cfac40 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 28 Nov 2011 11:44:19 -0500 Subject: [PATCH] Re-enabled OpenID 1.1 while I work on other things --- citadel/modules/openid/serv_openid_rp.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c index 5171399ef..7feb11336 100644 --- a/citadel/modules/openid/serv_openid_rp.c +++ b/citadel/modules/openid/serv_openid_rp.c @@ -858,6 +858,7 @@ void cmd_oids(char *argbuf) { syslog(LOG_DEBUG, "User-Supplied Identifier is: %s", ChrPtr(oiddata->claimed_id)); +#if 0 /********** OpenID 2.0 section 7.3 - Discovery **********/ /* Section 7.3.1 says we have to attempt XRI based discovery. @@ -868,14 +869,13 @@ void cmd_oids(char *argbuf) { /* Attempt section 7.3.2 (Yadis discovery) and section 7.3.3 (HTML discovery); */ int yadis_succeeded = perform_openid2_discovery(oiddata->claimed_id); +#endif + /************ OPENID 1.1 **********/ -#if 0 - /* old openid 1.1 implementation ... not ready to break things yet */ - if ( (yadis_succeeded == 0) - && (fetch_http(oiddata->claimed_id, &ReplyBuf) > 0) + if ( (fetch_http(oiddata->claimed_id, &ReplyBuf) > 0) && (StrLength(ReplyBuf) > 0) ) { openid_delegate = NewStrBuf(); @@ -927,7 +927,6 @@ void cmd_oids(char *argbuf) { return; } -#endif /* 0 */ FreeStrBuf(&ArgBuf); FreeStrBuf(&ReplyBuf); -- 2.30.2