diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2004-05-17 23:34:55 +0000 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2004-05-17 23:34:55 +0000 |
| commit | c614e5b4b12c771422da809014904fccccd442c8 (patch) | |
| tree | 32dd677a603a747f91110f666a1436a8950cdf0c /dbus/dbus-transport.c | |
| parent | 6527ee5134d8fef66549cdbb634a79b27aae90fc (diff) | |
* dbus/dbus-auth.c (client_try_next_mechanism): Remove logic to
filter against auth->allowed_mechs; we only add allowed mechs in
record_mechanisms().
* dbus/dbus-auth-script.c (_dbus_auth_script_run): Add an
ALLOWED_MECHS to auth-script format so we can set the list of
allowed mechanisms.
* data/auth/client-out-of-mechanisms.auth-script: New test to
check client disconnects when it is out of mechanisms to try.
* dbus/dbus-auth.c (process_command): Remove check for lines
longer that 1 MB; we only buffer up maximum 16 kB.
* dbus/dbus-transport.c, dbus/dbus-transport-unix.c,
dbus/dbus-auth-script.c, dbus/dbus-auth.c, dbus/dbus-auth.h:
Remove auth state AUTHENTICATED_WITH_UNUSED_BYTES, instead always
assume there might be unused bytes.
* dbus/dbus-auth.c (_dbus_auth_do_work): Remove check for
client-out-of-mechs, it is handled in process_reject(). Move check
for max failures to send_rejected(), as it's a server-only thing.
Diffstat (limited to 'dbus/dbus-transport.c')
| -rw-r--r-- | dbus/dbus-transport.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c index a439a6e3..371ecbfb 100644 --- a/dbus/dbus-transport.c +++ b/dbus/dbus-transport.c @@ -464,7 +464,6 @@ _dbus_transport_get_is_authenticated (DBusTransport *transport) switch (_dbus_auth_do_work (transport->auth)) { case DBUS_AUTH_STATE_AUTHENTICATED: - case DBUS_AUTH_STATE_AUTHENTICATED_WITH_UNUSED_BYTES: /* leave as maybe_authenticated */ break; default: @@ -674,9 +673,6 @@ _dbus_transport_do_iteration (DBusTransport *transport, static dbus_bool_t recover_unused_bytes (DBusTransport *transport) { - if (_dbus_auth_do_work (transport->auth) != DBUS_AUTH_STATE_AUTHENTICATED_WITH_UNUSED_BYTES) - return TRUE; - if (_dbus_auth_needs_decoding (transport->auth)) { DBusString plaintext; |