Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-05 17:45:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug in gpg_id vs. ssl_id (grrrr)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5775 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-11-04 15:01:43 +00:00
parent 997e833cc8
commit 9a6b675657
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libretroshare/src/rsserver/p3peers.cc
View File

@ -1100,7 +1100,7 @@ bool p3Peers::assignPeersToGroup(const std::string &groupId, const std::list<std
return mPeerMgr->assignPeersToGroup(groupId, peerIds, assign); return mPeerMgr->assignPeersToGroup(groupId, peerIds, assign);
} }
FileSearchFlags p3Peers::computePeerPermissionFlags(const std::string& peer_id, FileSearchFlags p3Peers::computePeerPermissionFlags(const std::string& peer_ssl_id,
FileStorageFlags share_flags, FileStorageFlags share_flags,
const std::list<std::string>& directory_parent_groups) const std::list<std::string>& directory_parent_groups)
{ {
@ -1111,6 +1111,7 @@ FileSearchFlags p3Peers::computePeerPermissionFlags(const std::string& peer_id,
// //
bool found = false ; bool found = false ;
std::string pgp_id = getGPGId(peer_ssl_id) ;
for(std::list<std::string>::const_iterator it(directory_parent_groups.begin());it!=directory_parent_groups.end() && !found;++it) for(std::list<std::string>::const_iterator it(directory_parent_groups.begin());it!=directory_parent_groups.end() && !found;++it)
{ {
@ -1122,7 +1123,7 @@ FileSearchFlags p3Peers::computePeerPermissionFlags(const std::string& peer_id,
} }
for(std::list<std::string>::const_iterator it2(info.peerIds.begin());it2!=info.peerIds.end() && !found;++it2) for(std::list<std::string>::const_iterator it2(info.peerIds.begin());it2!=info.peerIds.end() && !found;++it2)
if(*it2 == peer_id) if(*it2 == pgp_id)
found = true ; found = true ;
} }