From e369d2c215c57ef97938fae94ac0da25944ee21c Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Thu, 27 Apr 2017 09:26:21 -0700 Subject: [PATCH] Don't error with empty group Don't error if no group is specified, as this was the prior API. Also don't return a docker specific error message as this is in `/pkg` and used by other projects. Just set the default group for the current user/group consuming the package. Signed-off-by: Michael Crosby Upstream-commit: 169c013911c9465f0e62a37f467d1afa54a0dbe7 Component: engine --- components/engine/pkg/listeners/listeners_solaris.go | 8 +++++--- components/engine/pkg/listeners/listeners_unix.go | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/components/engine/pkg/listeners/listeners_solaris.go b/components/engine/pkg/listeners/listeners_solaris.go index 0482f3d732..c9003bcf68 100644 --- a/components/engine/pkg/listeners/listeners_solaris.go +++ b/components/engine/pkg/listeners/listeners_solaris.go @@ -22,10 +22,12 @@ func Init(proto, addr, socketGroup string, tlsConfig *tls.Config) (ls []net.List case "unix": gid, err := lookupGID(socketGroup) if err != nil { - if socketGroup != defaultSocketGroup { - return nil, err + if socketGroup != "" { + if socketGroup != defaultSocketGroup { + return nil, err + } + logrus.Warnf("could not change group %s to %s: %v", addr, defaultSocketGroup, err) } - logrus.Warnf("could not change group %s to %s: %v", addr, defaultSocketGroup, err) gid = os.Getgid() } l, err := sockets.NewUnixSocket(addr, gid) diff --git a/components/engine/pkg/listeners/listeners_unix.go b/components/engine/pkg/listeners/listeners_unix.go index 23ead610bf..25c98fba17 100644 --- a/components/engine/pkg/listeners/listeners_unix.go +++ b/components/engine/pkg/listeners/listeners_unix.go @@ -35,10 +35,12 @@ func Init(proto, addr, socketGroup string, tlsConfig *tls.Config) ([]net.Listene case "unix": gid, err := lookupGID(socketGroup) if err != nil { - if socketGroup != defaultSocketGroup { - return nil, err + if socketGroup != "" { + if socketGroup != defaultSocketGroup { + return nil, err + } + logrus.Warnf("could not change group %s to %s: %v", addr, defaultSocketGroup, err) } - logrus.Warnf("could not change group %s to %s: %v", addr, defaultSocketGroup, err) gid = os.Getgid() } l, err := sockets.NewUnixSocket(addr, gid)