0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request from crosbymichael/unix-group

Browse source 
Don't error with empty group
This commit is contained in:
Brian Goff 2017-04-27 15:50:21 -04:00 • committed by GitHub
commit cfae6278be
2 changed files with 10 additions and 6 deletions

8
pkg/listeners/listeners_solaris.go
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)

8
pkg/listeners/listeners_unix.go
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)