summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-04-17 13:48:20 +0000
committergVisor bot <gvisor-bot@google.com>2020-04-17 13:48:20 +0000
commit629c881535e4b9dbfac077c9f8073bff84869b15 (patch)
treea7f5fe80499d44dbe5d1db37ebd4e39e0a1bf842 /pkg/sentry
parent6cb5f4c66f69a8beee5aa2d45221b29d162e38f8 (diff)
parentb4de018a67f5b5cb5ffc782c915107e1402ed833 (diff)
Merge release-20200323.0-174-gb4de018 (automated)
Diffstat (limited to 'pkg/sentry')
-rw-r--r--pkg/sentry/socket/unix/transport/unix.go2
1 files changed, 0 insertions, 2 deletions
diff --git a/pkg/sentry/socket/unix/transport/unix.go b/pkg/sentry/socket/unix/transport/unix.go
index 1f3880cc5..2f1b127df 100644
--- a/pkg/sentry/socket/unix/transport/unix.go
+++ b/pkg/sentry/socket/unix/transport/unix.go
@@ -850,7 +850,6 @@ func (e *baseEndpoint) SetSockOptBool(opt tcpip.SockOptBool, v bool) *tcpip.Erro
case tcpip.ReuseAddressOption:
default:
log.Warningf("Unsupported socket option: %d", opt)
- return tcpip.ErrUnknownProtocolOption
}
return nil
}
@@ -861,7 +860,6 @@ func (e *baseEndpoint) SetSockOptInt(opt tcpip.SockOptInt, v int) *tcpip.Error {
case tcpip.ReceiveBufferSizeOption:
default:
log.Warningf("Unsupported socket option: %d", opt)
- return tcpip.ErrUnknownProtocolOption
}
return nil
}