Merge remote-tracking branch 'upstream/master' into ca-drv-exotic

1 files changed, 9 insertions, 0 deletions

diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
index 0e2169035..139a05587 100644
--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@@ -1036,6 +1036,15 @@ void processConnection(
     if (GET_PROTOCOL_MINOR(clientVersion) >= 33)
         to << nixVersion;
 
+    if (GET_PROTOCOL_MINOR(clientVersion) >= 35) {
+        // We and the underlying store both need to trust the client for
+        // it to be trusted.
+        auto temp = trusted
+            ? store->isTrustedClient()
+            : std::optional { NotTrusted };
+        worker_proto::write(*store, to, temp);
+    }
+
     /* Send startup error messages to the client. */
     tunnelLogger->startWork();