From 451043367be65468dd96bbf5868af666b25f1663 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Tue, 24 Mar 2015 08:53:28 -0700 Subject: [PATCH] Update syndtr/gocapability to 8e4cdcb3c22b40d5e330ade0b68cb2e2a3cf6f98 It includes fix for RHEL6 which has no cap_last. Signed-off-by: Alexander Morozov --- update-vendor.sh | 2 +- .../syndtr/gocapability/capability/capability_linux.go | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/update-vendor.sh b/update-vendor.sh index 12077256..b68f5d46 100755 --- a/update-vendor.sh +++ b/update-vendor.sh @@ -44,6 +44,6 @@ clone git github.com/codegangsta/cli 1.1.0 clone git github.com/coreos/go-systemd v2 clone git github.com/godbus/dbus v2 clone git github.com/Sirupsen/logrus v0.6.6 -clone git github.com/syndtr/gocapability e55e583369 +clone git github.com/syndtr/gocapability 8e4cdcb # intentionally not vendoring Docker itself... that'd be a circle :) diff --git a/vendor/src/github.com/syndtr/gocapability/capability/capability_linux.go b/vendor/src/github.com/syndtr/gocapability/capability/capability_linux.go index 24dc85fa..3dfcd398 100644 --- a/vendor/src/github.com/syndtr/gocapability/capability/capability_linux.go +++ b/vendor/src/github.com/syndtr/gocapability/capability/capability_linux.go @@ -417,10 +417,6 @@ func (c *capsV3) Load() (err error) { } func (c *capsV3) Apply(kind CapType) (err error) { - err = initLastCap() - if err != nil { - return - } if kind&BOUNDS == BOUNDS { var data [2]capData err = capget(&c.hdr, &data[0]) @@ -428,7 +424,7 @@ func (c *capsV3) Apply(kind CapType) (err error) { return } if (1<