From b3e2954930f99e450cd944517fe3577aba176645 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Sat, 25 Jan 2014 21:41:29 +0100 Subject: Revert "lockdown: do not send Goodbye when SSL session was active" This reverts commit 56392428a49543bab4b12431451ec04bb799c411. Actually I committed this because of usbmuxd complaining about a TCP RST. But lockdownd is now complaining since it waits for the Goodbye packet (which I apparently didn't see during testing). --- src/lockdown.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lockdown.c') diff --git a/src/lockdown.c b/src/lockdown.c index 536207f..a0bc2f4 100644 --- a/src/lockdown.c +++ b/src/lockdown.c @@ -269,7 +269,7 @@ lockdownd_error_t lockdownd_client_free(lockdownd_client_t client) lockdownd_stop_session(client, client->session_id); } - if (!client->ssl_enabled) { + if (client->parent) { lockdownd_goodbye(client); } @@ -1173,7 +1173,7 @@ lockdownd_error_t lockdownd_enter_recovery(lockdownd_client_t client) */ lockdownd_error_t lockdownd_goodbye(lockdownd_client_t client) { - if (!client || !client->parent) + if (!client) return LOCKDOWN_E_INVALID_ARG; lockdownd_error_t ret = LOCKDOWN_E_UNKNOWN_ERROR; -- cgit v1.1-32-gdbae