diff --git a/libretroshare/src/pqi/p3peermgr.cc b/libretroshare/src/pqi/p3peermgr.cc index d41d63e5a..bbb0a324a 100644 --- a/libretroshare/src/pqi/p3peermgr.cc +++ b/libretroshare/src/pqi/p3peermgr.cc @@ -1514,7 +1514,7 @@ bool p3PeerMgrIMPL::loadList(std::list& load) std::cerr << "Loaded service permission item: " << std::endl; for(uint32_t i=0;ipgp_ids.size();++i) - if(AuthGPG::getAuthGPG()->isGPGAccepted(sitem->pgp_ids[i])) + if(AuthGPG::getAuthGPG()->isGPGAccepted(sitem->pgp_ids[i]) || sitem->pgp_ids[i] == AuthGPG::getAuthGPG()->getGPGOwnId()) { mFriendsPermissionFlags[sitem->pgp_ids[i]] = sitem->service_flags[i] ; std::cerr << " " << sitem->pgp_ids[i] << " - " << sitem->service_flags[i] << std::endl; diff --git a/libretroshare/src/retroshare/rspeers.h b/libretroshare/src/retroshare/rspeers.h index 12b0b78a9..d589d627a 100644 --- a/libretroshare/src/retroshare/rspeers.h +++ b/libretroshare/src/retroshare/rspeers.h @@ -68,6 +68,7 @@ const uint32_t RS_PEER_STATE_UNREACHABLE= 0x0008; // Service permission flags. // +const ServicePermissionFlags RS_SERVICE_PERM_NONE ( 0x00000000 ) ; const ServicePermissionFlags RS_SERVICE_PERM_TURTLE ( 0x00000001 ) ; const ServicePermissionFlags RS_SERVICE_PERM_DISCOVERY ( 0x00000002 ) ; const ServicePermissionFlags RS_SERVICE_PERM_DISTRIB ( 0x00000004 ) ; diff --git a/libretroshare/src/rsserver/p3peers.cc b/libretroshare/src/rsserver/p3peers.cc index eb1732d99..1a78635df 100644 --- a/libretroshare/src/rsserver/p3peers.cc +++ b/libretroshare/src/rsserver/p3peers.cc @@ -265,10 +265,12 @@ bool p3Peers::getPeerDetails(const std::string &id, RsPeerDetails &d) #ifdef P3PEERS_DEBUG std::cerr << "p3Peers::getPeerDetails() ERROR not an SSL Id: " << id << std::endl; #endif - d.isOnlyGPGdetail = true; - d.service_perm_flags = mPeerMgr->servicePermissionFlags_sslid(id) ; + bool res = getGPGDetails(id, d); - return getGPGDetails(id, d); + d.isOnlyGPGdetail = true; + d.service_perm_flags = mPeerMgr->servicePermissionFlags(id) ; + + return res ; } }