Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-13 00:25:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

added key restore to forums and fixed restore bug

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4023 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2011-02-08 22:34:54 +00:00
parent 17a57e0509
commit bbcbc9282e
7 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libretroshare/src/services/p3distrib.cc
View file

@ -2041,7 +2041,7 @@ bool p3GroupDistrib::backUpKeys(const std::list<RsDistribGrpKey* >& keysToBackUp
}
delete store;
delete store;
if(!RsDirUtil::renameFile(filenametmp,filename))
{
@ -2058,7 +2058,7 @@ bool p3GroupDistrib::backUpKeys(const std::list<RsDistribGrpKey* >& keysToBackUp
return ok;
}
bool p3GroupDistrib::restoreGrpKeys(std::string grpId){
bool p3GroupDistrib::restoreGrpKeys(const std::string& grpId){
#ifdef DISTRIB_DEBUG
@ -2077,6 +2077,7 @@ bool p3GroupDistrib::restoreGrpKeys(std::string grpId){
RsItem* item;
bool ok = true;
bool itemAttempted = false;
RsDistribGrpKey* key = NULL;
RsStackMutex stack(distribMtx);
@ -2086,7 +2087,7 @@ bool p3GroupDistrib::restoreGrpKeys(std::string grpId){
while(NULL != (item = store->GetItem())){
itemAttempted = true;
RsDistribGrpKey* key = dynamic_cast<RsDistribGrpKey* >(item);
key = dynamic_cast<RsDistribGrpKey* >(item);
if(key == NULL){
#ifdef DISTRIB_DEBUG
@ -2097,20 +2098,14 @@ bool p3GroupDistrib::restoreGrpKeys(std::string grpId){
return false;
}
if(key->key.keyFlags & RSTLV_KEY_DISTRIB_ADMIN){
if(key->key.keyFlags & RSTLV_KEY_DISTRIB_ADMIN)
ok &= locked_updateGroupAdminKey(*gi, key);
}else
if((key->key.keyFlags & RSTLV_KEY_DISTRIB_PRIVATE)){
else if((key->key.keyFlags & RSTLV_KEY_DISTRIB_PRIVATE) ||
(key->key.keyFlags & RSTLV_KEY_DISTRIB_PUBLIC))
ok &= locked_updateGroupPublishKey(*gi, key);
}else{
else
ok &= false;
}
}