Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-16 21:12:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed conflicts in merging upstream/master to v0.6-FTEncryption

Browse source
This commit is contained in:
mr-alice 2016-11-01 14:23:13 +01:00
commit 8c7c7647b0
173 changed files with 2701 additions and 13742 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libretroshare/src/rsserver/rsaccounts.cc
View file

@ -536,8 +536,7 @@ bool RsAccountsDetail::getAvailableAccounts(std::map<RsPeerId, AccountDetails> &
for(;dirIt.isValid();dirIt.next())
{
/* check entry type */
std::string fname;
dirIt.d_name(fname);
std::string fname = dirIt.file_name();
std::string fullname = mBaseDirectory + "/" + fname;
#ifdef FIM_DEBUG
std::cerr << "calling stats on " << fullname <<std::endl;
@ -1060,7 +1059,7 @@ bool RsAccountsDetail::GenerateSSLCertificate(const RsPgpId& pgp_id, const s
X509_print_ex(bio_out, x509, nmflag, reqflag);
BIO_flush(bio_out);
(void) BIO_flush(bio_out);
BIO_free(bio_out);
/* Save cert to file */