diff options
| author | Grant Limberg <glimberg@gmail.com> | 2016-09-08 17:45:46 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2016-09-08 17:45:46 -0700 |
| commit | 5ed5b22525b9233871e3fca8da2c9d77535afd7b (patch) | |
| tree | 0c39ab15dd1a9456a204e69e8d51eaaed2e8944d /node/Membership.cpp | |
| parent | dccca7df1a893dacc50a605d707917f579d05db9 (diff) | |
| parent | 8afdb0aa651fcad00d4eaa0d09d5b4d40bbfb864 (diff) | |
| download | infinitytier-5ed5b22525b9233871e3fca8da2c9d77535afd7b.tar.gz infinitytier-5ed5b22525b9233871e3fca8da2c9d77535afd7b.zip | |
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
Diffstat (limited to 'node/Membership.cpp')
| -rw-r--r-- | node/Membership.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/node/Membership.cpp b/node/Membership.cpp index e809e2bd..25ae1d9c 100644 --- a/node/Membership.cpp +++ b/node/Membership.cpp @@ -95,7 +95,9 @@ int Membership::addCredential(const RuntimeEnvironment *RR,const CertificateOfMe TRACE("addCredential(CertificateOfMembership) for %s on %.16llx ACCEPTED (redundant)",com.issuedTo().toString().c_str(),com.networkId()); return 0; } + const int vr = com.verify(RR); + if (vr == 0) { TRACE("addCredential(CertificateOfMembership) for %s on %.16llx ACCEPTED (new)",com.issuedTo().toString().c_str(),com.networkId()); if (com.timestamp().first > _com.timestamp().first) { @@ -104,6 +106,7 @@ int Membership::addCredential(const RuntimeEnvironment *RR,const CertificateOfMe } else { TRACE("addCredential(CertificateOfMembership) for %s on %.16llx REJECTED (%d)",com.issuedTo().toString().c_str(),com.networkId(),vr); } + return vr; } |