- MGR: The ReturnURL cookie is optional, not required.

clientgui/
        browser.cpp

svn path=/trunk/boinc/; revision=18404
This commit is contained in:
Rom Walton 2009-06-12 22:54:32 +00:00
parent 311815e60a
commit d2ad500198
2 changed files with 26 additions and 8 deletions

View File

@ -5581,3 +5581,9 @@ David 12 June 2009
sched/ sched/
start start
Rom 12 June 2009
- MGR: The ReturnURL cookie is optional, not required.
clientgui/
browser.cpp

View File

@ -685,21 +685,33 @@ bool detect_account_manager_credentials(
#ifdef _WIN32 #ifdef _WIN32
if ( detect_cookie_ie(project_url, strCookieLogon, login) && if ( detect_cookie_ie(project_url, strCookieLogon, login) &&
detect_cookie_ie(project_url, strCookiePasswordHash, password_hash) && detect_cookie_ie(project_url, strCookiePasswordHash, password_hash)
detect_cookie_ie(project_url, strCookieReturnURL, return_url) ) goto END; ){
detect_cookie_ie(project_url, strCookieReturnURL, return_url);
goto END;
}
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
if ( detect_cookie_safari(project_url, strCookieLogon, login) && if ( detect_cookie_safari(project_url, strCookieLogon, login) &&
detect_cookie_safari(project_url, strCookiePasswordHash, password_hash) && detect_cookie_safari(project_url, strCookiePasswordHash, password_hash)
detect_cookie_safari(project_url, strCookieReturnURL, return_url) ) goto END; ){
detect_cookie_safari(project_url, strCookieReturnURL, return_url);
goto END;
}
#endif #endif
if ( detect_cookie_firefox_3(project_url, strCookieLogon, login) && if ( detect_cookie_firefox_3(project_url, strCookieLogon, login) &&
detect_cookie_firefox_3(project_url, strCookiePasswordHash, password_hash) && detect_cookie_firefox_3(project_url, strCookiePasswordHash, password_hash)
detect_cookie_firefox_3(project_url, strCookieReturnURL, return_url) ) goto END; ){
detect_cookie_firefox_3(project_url, strCookieReturnURL, return_url);
goto END;
}
if ( detect_cookie_firefox_2(project_url, strCookieLogon, login) && if ( detect_cookie_firefox_2(project_url, strCookieLogon, login) &&
detect_cookie_firefox_2(project_url, strCookiePasswordHash, password_hash) && detect_cookie_firefox_2(project_url, strCookiePasswordHash, password_hash)
detect_cookie_firefox_2(project_url, strCookieReturnURL, return_url) ) goto END; ){
detect_cookie_firefox_2(project_url, strCookieReturnURL, return_url);
goto END;
}
END: END:
if (!login.empty() && !password_hash.empty()) { if (!login.empty() && !password_hash.empty()) {