From 1485ccbe87e8df819ae603b2bbdd84495de015e2 Mon Sep 17 00:00:00 2001 From: chrisparker126 Date: Thu, 8 Apr 2010 13:24:08 +0000 Subject: [PATCH] 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 --- libretroshare/src/rsserver/rsinit.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc index 8c2367cdc..098165332 100644 --- a/libretroshare/src/rsserver/rsinit.cc +++ b/libretroshare/src/rsserver/rsinit.cc @@ -1453,8 +1453,7 @@ bool RsInit::RsStoreAutoLogin() return true; #else -//XXX temp -#ifdef 0 + /* store password encrypted in a file */ std::string entropy = RsInitConfig::load_cert; @@ -1533,7 +1532,6 @@ bool RsInit::RsStoreAutoLogin() free(pbDataEnt); LocalFree(DataOut.pbData); #endif -#endif /******************************** WINDOWS/UNIX SPECIFIC PART ******************/ return false; @@ -1585,7 +1583,6 @@ bool RsInit::RsTryAutoLogin() return true; #else -#ifdef 0 //XXX Temp /* try to load from file */ std::string entropy = RsInitConfig::load_cert; /* get the data out */ @@ -1691,7 +1688,6 @@ bool RsInit::RsTryAutoLogin() return isDecrypt; #endif -#endif /******************************** WINDOWS/UNIX SPECIFIC PART ******************/ return false; @@ -1699,7 +1695,6 @@ bool RsInit::RsTryAutoLogin() bool RsInit::RsClearAutoLogin() { -#ifndef WINDOWS_SYS std::string passwdfile = RsInitConfig::configDir; passwdfile += RsInitConfig::dirSeperator + configKeyDir + RsInitConfig::dirSeperator; passwdfile += "help.dta"; @@ -1718,7 +1713,7 @@ bool RsInit::RsClearAutoLogin() std::cerr << std::endl; return true; } -#endif + return false; }