diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-31 16:28:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-31 16:28:09 +0200 |
| commit | 9b86835c3976dbe81807f22d31a6d993b0ec9dd5 (patch) | |
| tree | 8d7b7123540029b8dc7bbb0e46541eb74eeb5943 /vendor | |
| parent | 9c7410d331ed6c9af50babb41314bfa67a3f39e0 (diff) | |
| parent | 4841cd1630d892cd2e1353c88502235e79f2556f (diff) | |
| download | podman-9b86835c3976dbe81807f22d31a6d993b0ec9dd5.tar.gz podman-9b86835c3976dbe81807f22d31a6d993b0ec9dd5.tar.bz2 podman-9b86835c3976dbe81807f22d31a6d993b0ec9dd5.zip | |
Merge pull request #5674 from containers/dependabot/go_modules/github.com/rootless-containers/rootlesskit-0.9.3
Bump github.com/rootless-containers/rootlesskit from 0.9.2 to 0.9.3
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/rootless-containers/rootlesskit/pkg/port/portutil/portutil.go | 3 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/vendor/github.com/rootless-containers/rootlesskit/pkg/port/portutil/portutil.go b/vendor/github.com/rootless-containers/rootlesskit/pkg/port/portutil/portutil.go index f1aa5f859..4fc081d43 100644 --- a/vendor/github.com/rootless-containers/rootlesskit/pkg/port/portutil/portutil.go +++ b/vendor/github.com/rootless-containers/rootlesskit/pkg/port/portutil/portutil.go @@ -58,8 +58,7 @@ func ValidatePortSpec(spec port.Spec, existingPorts map[int]*port.Status) error sp := p.Spec sameProto := sp.Proto == spec.Proto sameParent := sp.ParentIP == spec.ParentIP && sp.ParentPort == spec.ParentPort - sameChild := sp.ChildPort == spec.ChildPort - if sameProto && (sameParent || sameChild) { + if sameProto && sameParent { return errors.Errorf("conflict with ID %d", id) } } diff --git a/vendor/modules.txt b/vendor/modules.txt index ad801a07a..40bc53872 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -450,7 +450,7 @@ github.com/prometheus/common/model github.com/prometheus/procfs github.com/prometheus/procfs/internal/fs github.com/prometheus/procfs/internal/util -# github.com/rootless-containers/rootlesskit v0.9.2 +# github.com/rootless-containers/rootlesskit v0.9.3 github.com/rootless-containers/rootlesskit/pkg/msgutil github.com/rootless-containers/rootlesskit/pkg/port github.com/rootless-containers/rootlesskit/pkg/port/builtin |