diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-02 00:37:43 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-02 00:37:43 +0000 |
| commit | efcd30da891eccdb3518e9c07afc6f907e9ac5e6 (patch) | |
| tree | 70b91a28476765350a9102a245d6a83da82af26f /src/libstore/remote-store.cc | |
| parent | 754c910953901ced4fbd27a8b86d36d57cb72996 (diff) | |
WIP
Diffstat (limited to 'src/libstore/remote-store.cc')
| -rw-r--r-- | src/libstore/remote-store.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index 2037a55f4..2744245f3 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -381,7 +381,9 @@ void RemoteStore::queryPathInfoUncached(const StorePath & path, if (GET_PROTOCOL_MINOR(conn->daemonVersion) >= 16) { conn->from >> info->ultimate; info->sigs = readStrings<StringSet>(conn->from); - conn->from >> info->ca; + string caOptRaw; + conn->from >> caOptRaw; + info->ca = parseCaOpt(caOptRaw); } } callback(std::move(info)); @@ -474,7 +476,7 @@ void RemoteStore::addToStore(const ValidPathInfo & info, Source & source, << info.narHash.to_string(Base::Base16, false); writeStorePaths(*this, conn->to, info.references); conn->to << info.registrationTime << info.narSize - << info.ultimate << info.sigs << info.ca + << info.ultimate << info.sigs << renderContentAddress(info.ca) << repair << !checkSigs; bool tunnel = GET_PROTOCOL_MINOR(conn->daemonVersion) >= 21; if (!tunnel) copyNAR(source, conn->to); |