mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-13 19:42:28 -04:00
tested autologin on windows, seems fine
-removed #ifdef , seems git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2691 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
658946bcd2
commit
1485ccbe87
1 changed files with 2 additions and 7 deletions
|
@ -1453,8 +1453,7 @@ bool RsInit::RsStoreAutoLogin()
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
#else
|
#else
|
||||||
//XXX temp
|
|
||||||
#ifdef 0
|
|
||||||
/* store password encrypted in a file */
|
/* store password encrypted in a file */
|
||||||
std::string entropy = RsInitConfig::load_cert;
|
std::string entropy = RsInitConfig::load_cert;
|
||||||
|
|
||||||
|
@ -1533,7 +1532,6 @@ bool RsInit::RsStoreAutoLogin()
|
||||||
free(pbDataEnt);
|
free(pbDataEnt);
|
||||||
LocalFree(DataOut.pbData);
|
LocalFree(DataOut.pbData);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
|
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -1585,7 +1583,6 @@ bool RsInit::RsTryAutoLogin()
|
||||||
return true;
|
return true;
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#ifdef 0 //XXX Temp
|
|
||||||
/* try to load from file */
|
/* try to load from file */
|
||||||
std::string entropy = RsInitConfig::load_cert;
|
std::string entropy = RsInitConfig::load_cert;
|
||||||
/* get the data out */
|
/* get the data out */
|
||||||
|
@ -1691,7 +1688,6 @@ bool RsInit::RsTryAutoLogin()
|
||||||
|
|
||||||
return isDecrypt;
|
return isDecrypt;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
|
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -1699,7 +1695,6 @@ bool RsInit::RsTryAutoLogin()
|
||||||
|
|
||||||
bool RsInit::RsClearAutoLogin()
|
bool RsInit::RsClearAutoLogin()
|
||||||
{
|
{
|
||||||
#ifndef WINDOWS_SYS
|
|
||||||
std::string passwdfile = RsInitConfig::configDir;
|
std::string passwdfile = RsInitConfig::configDir;
|
||||||
passwdfile += RsInitConfig::dirSeperator + configKeyDir + RsInitConfig::dirSeperator;
|
passwdfile += RsInitConfig::dirSeperator + configKeyDir + RsInitConfig::dirSeperator;
|
||||||
passwdfile += "help.dta";
|
passwdfile += "help.dta";
|
||||||
|
@ -1718,7 +1713,7 @@ bool RsInit::RsClearAutoLogin()
|
||||||
std::cerr << std::endl;
|
std::cerr << std::endl;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue