Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

no time stamp when merging from disk without signature modification

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6393 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-05-31 12:42:16 +00:00
parent 044858953a
commit 554234d385
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/pgp/pgphandler.cc
View File

@ -930,14 +930,16 @@ bool PGPHandler::addOrMergeKey(ops_keyring_t *keyring,std::map<std::string,PGPCe
std::cerr << " Key exists. Merging signatures." << std::endl; std::cerr << " Key exists. Merging signatures." << std::endl;
#endif #endif
ret = mergeKeySignatures(const_cast<ops_keydata_t*>(existing_key),keydata) ; ret = mergeKeySignatures(const_cast<ops_keydata_t*>(existing_key),keydata) ;
res->second._time_stamp = time(NULL) ;
if(ret) if(ret)
initCertificateInfo(kmap[id.toStdString()],existing_key,res->second._key_index) ; initCertificateInfo(kmap[id.toStdString()],existing_key,res->second._key_index) ;
} }
if(ret) if(ret)
{
validateAndUpdateSignatures(kmap[id.toStdString()],existing_key) ; validateAndUpdateSignatures(kmap[id.toStdString()],existing_key) ;
kmap[id.toStdString()]._time_stamp = time(NULL) ;
}
return ret ; return ret ;
} }