mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
reverted unwanted commit
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7017 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
c2e7b0826f
commit
3bb98a2424
@ -367,7 +367,7 @@ int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored, bool strictCheck
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
for( i=0; i<argc; i++)
|
for( i=0; i<argc; i++)
|
||||||
fprintf(stderr, "%d: %s\n", i, argv[i]);
|
printf("%d: %s\n", i, argv[i]);
|
||||||
|
|
||||||
/* for static PThreads under windows... we need to init the library...
|
/* for static PThreads under windows... we need to init the library...
|
||||||
*/
|
*/
|
||||||
@ -1309,7 +1309,7 @@ bool RsInit::GenerateSSLCertificate(const std::string& gpg_id, const std::st
|
|||||||
/* Print the signed Certificate! */
|
/* Print the signed Certificate! */
|
||||||
BIO *bio_out = NULL;
|
BIO *bio_out = NULL;
|
||||||
bio_out = BIO_new(BIO_s_file());
|
bio_out = BIO_new(BIO_s_file());
|
||||||
BIO_set_fp(bio_out,stderr,BIO_NOCLOSE);
|
BIO_set_fp(bio_out,stdout,BIO_NOCLOSE);
|
||||||
|
|
||||||
/* Print it out */
|
/* Print it out */
|
||||||
int nmflag = 0;
|
int nmflag = 0;
|
||||||
@ -1470,14 +1470,6 @@ bool RsInit::LoadPassword(const std::string& id, const std::string& inPwd)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool RsInit::SavePassword()
|
|
||||||
{
|
|
||||||
if (RsLoginHandler::checkAndStoreSSLPasswdIntoGPGFile(RsInitConfig::preferedId,RsInitConfig::passwd) == false) {
|
|
||||||
std::cerr << "in RsInit::SavePassword(): RsLoginHandler::checkAndStoreSSLPasswdIntoGPGFile() Failed!";
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Locks the profile directory and tries to finalize the login procedure
|
* Locks the profile directory and tries to finalize the login procedure
|
||||||
|
Loading…
Reference in New Issue
Block a user