summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/socket/unix
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-10-23 17:51:50 +0000
committergVisor bot <gvisor-bot@google.com>2020-10-23 17:51:50 +0000
commitce44e4f40f7c2c2642da14cd9cbf9bee3fc0b6b2 (patch)
tree8a9c2124c6b86cdd8192b17b5a5dac180d879ed9 /pkg/sentry/socket/unix
parentaddf7ba2386b07677892262caede551b90bedcb2 (diff)
parent39e9b3bb8a25cdfdbc2203e33c6881a7c2c88766 (diff)
Merge release-20201019.0-37-g39e9b3bb8 (automated)
Diffstat (limited to 'pkg/sentry/socket/unix')
-rw-r--r--pkg/sentry/socket/unix/transport/unix.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/socket/unix/transport/unix.go b/pkg/sentry/socket/unix/transport/unix.go
index d6fc03520..4b9e119a8 100644
--- a/pkg/sentry/socket/unix/transport/unix.go
+++ b/pkg/sentry/socket/unix/transport/unix.go
@@ -879,7 +879,7 @@ func (e *baseEndpoint) SetSockOptInt(opt tcpip.SockOptInt, v int) *tcpip.Error {
func (e *baseEndpoint) GetSockOptBool(opt tcpip.SockOptBool) (bool, *tcpip.Error) {
switch opt {
- case tcpip.KeepaliveEnabledOption:
+ case tcpip.KeepaliveEnabledOption, tcpip.AcceptConnOption:
return false, nil
case tcpip.PasscredOption: