From: Daniel Lenski Date: Tue, 17 Nov 2020 20:29:22 +0000 (+0000) Subject: Merge branch 'enable_insecure_debugging' into 'master' X-Git-Tag: v8.20~384 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=14c124c3a227ac25a39569424907f3ad32fae936;p=users%2Fdwmw2%2Fopenconnect.git Merge branch 'enable_insecure_debugging' into 'master' Enable insecure debugging See merge request openconnect/openconnect!112 --- 14c124c3a227ac25a39569424907f3ad32fae936 diff --cc main.c index a46f7a0e,cf3b5fdb..7978af22 --- a/main.c +++ b/main.c @@@ -2063,13 -2036,15 +2080,19 @@@ int main(int argc, char **argv ret = 0; break; case -ECONNABORTED: - vpn_progress(vpninfo, PRG_INFO, _("User detached from session (SIGHUP); exiting.\n")); + vpn_progress(vpninfo, PRG_INFO, _("User detached from session (%s); exiting.\n"), + #ifdef INSECURE_DEBUGGING + "SIGHUP/SIGINT" + #else + "SIGHUP" + #endif + ); ret = 0; break; + case -EIO: + vpn_progress(vpninfo, PRG_INFO, _("Unrecoverable I/O error; exiting.\n")); + ret = 1; + break; default: vpn_progress(vpninfo, PRG_ERR, _("Unknown error; exiting.\n")); ret = 1;