toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #32897 from crosbymichael/unix-group

Browse Source 
Don't error with empty group
Upstream-commit: cfae6278be8091e3b6025deaf0a9e225662a017f
Component: engine
This commit is contained in:
Brian Goff
2017-04-27 15:50:21 -04:00
committed by GitHub
parent c4a7515140 e369d2c215
commit 521ddefb3a
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/pkg/listeners/listeners_solaris.go
+5 -3
View File
@@ -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)
components/engine/pkg/listeners/listeners_unix.go
+5 -3
View File
@@ -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)