[lxc-devel] [lxd/master] Fix build with current version of bakery

stgraber on Github lxc-bot at linuxcontainers.org
Fri Oct 20 17:02:38 UTC 2017


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20171020/7ea16699/attachment.bin>
-------------- next part --------------
From 1f36bb9895819b7a2bccd715e8a4a5f456dd0d41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Fri, 20 Oct 2017 13:02:13 -0400
Subject: [PATCH] Fix build with current version of bakery
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/daemon.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxd/daemon.go b/lxd/daemon.go
index 38186e167..d5e3244e6 100644
--- a/lxd/daemon.go
+++ b/lxd/daemon.go
@@ -168,7 +168,7 @@ func writeMacaroonsRequiredResponse(b *bakery.Bakery, r *http.Request, w http.Re
 	ctx := httpbakery.ContextWithRequest(context.TODO(), r)
 	// Mint an appropriate macaroon and send it back to the client.
 	m, err := b.Oven.NewMacaroon(
-		ctx, httpbakery.RequestVersion(r), time.Now().Add(5*time.Minute), derr.Caveats, derr.Ops...)
+		ctx, httpbakery.RequestVersion(r), derr.Caveats, derr.Ops...)
 	if err != nil {
 		resp := errorResponse{http.StatusInternalServerError, err.Error()}
 		resp.Render(w)


More information about the lxc-devel mailing list