diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-09 15:52:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-09 15:52:12 -0400 |
| commit | 5aebae436f8e60add168df5645baba2ef9d07c37 (patch) | |
| tree | ae4240c48791090993f2755b6997014c31a0e4d3 /vendor/github.com/godbus/dbus/v5/auth.go | |
| parent | 536951c1d23cd792e5e4ca8616f219d1cc08d39b (diff) | |
| parent | c65b43a0fa53808077aa70436814b82f17236bec (diff) | |
| download | podman-5aebae436f8e60add168df5645baba2ef9d07c37.tar.gz podman-5aebae436f8e60add168df5645baba2ef9d07c37.tar.bz2 podman-5aebae436f8e60add168df5645baba2ef9d07c37.zip | |
Merge pull request #11508 from containers/dependabot/go_modules/github.com/godbus/dbus/v5-5.0.5
Bump github.com/godbus/dbus/v5 from 5.0.4 to 5.0.5
Diffstat (limited to 'vendor/github.com/godbus/dbus/v5/auth.go')
| -rw-r--r-- | vendor/github.com/godbus/dbus/v5/auth.go | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/vendor/github.com/godbus/dbus/v5/auth.go b/vendor/github.com/godbus/dbus/v5/auth.go index 283487a0e..eb0b2f434 100644 --- a/vendor/github.com/godbus/dbus/v5/auth.go +++ b/vendor/github.com/godbus/dbus/v5/auth.go @@ -75,9 +75,9 @@ func (conn *Conn) Auth(methods []Auth) error { s = s[1:] for _, v := range s { for _, m := range methods { - if name, data, status := m.FirstData(); bytes.Equal(v, name) { + if name, _, status := m.FirstData(); bytes.Equal(v, name) { var ok bool - err = authWriteLine(conn.transport, []byte("AUTH"), v, data) + err = authWriteLine(conn.transport, []byte("AUTH"), v) if err != nil { return err } @@ -194,11 +194,14 @@ func (conn *Conn) tryAuth(m Auth, state authState, in *bufio.Reader) (error, boo } conn.uuid = string(s[1]) return nil, true + case state == waitingForOk && string(s[0]) == "DATA": + err = authWriteLine(conn.transport, []byte("DATA")) + if err != nil { + return err, false + } case state == waitingForOk && string(s[0]) == "REJECTED": return nil, false - case state == waitingForOk && (string(s[0]) == "DATA" || - string(s[0]) == "ERROR"): - + case state == waitingForOk && string(s[0]) == "ERROR": err = authWriteLine(conn.transport, []byte("CANCEL")) if err != nil { return err, false |