From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 22 Jul 2024 23:48:54 +0000 (-0400)
Subject: make keeplocked client UUID optional
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~21^2~228^2~88
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=163a7e91c4e3e5bd8116b78038c4812edf4e5497;p=git-annex.git

make keeplocked client UUID optional

It's not used, but it makes the protocol simpler if this parameter can
always be sent.
---

diff --git a/P2P/Http.hs b/P2P/Http.hs
index 638a81ed53..9919822f0a 100644
--- a/P2P/Http.hs
+++ b/P2P/Http.hs
@@ -872,7 +872,7 @@ clientLockContent clientenv (ProtocolVersion ver) k su cu bypass auth =
 
 type KeepLockedAPI
 	= LockIDParam
-	:> CU Required
+	:> CU Optional
 	:> BypassUUIDs
 	:> IsSecure
 	:> AuthHeader
@@ -887,7 +887,7 @@ serveKeepLocked
 	-> B64UUID ServerSide
 	-> v
 	-> LockID
-	-> B64UUID ClientSide
+	-> Maybe (B64UUID ClientSide)
 	-> [B64UUID Bypass]
 	-> IsSecure
 	-> Maybe Auth
@@ -923,7 +923,7 @@ clientKeepLocked
 clientKeepLocked clientenv (ProtocolVersion ver) lckid su cu bypass auth a = do
 	keeplocked <- newEmptyTMVarIO
 	tid <- async $ a keeplocked
-	let cli' = cli lckid cu bypass auth
+	let cli' = cli lckid (Just cu) bypass auth
 		(Just connectionKeepAlive) (Just keepAlive)
 		(S.fromStepT (unlocksender keeplocked))
 	withClientM cli' clientenv $ \case