]> www.infradead.org Git - users/dwmw2/openconnect.git/commitdiff
Merge branch 'enable_insecure_debugging' into 'master'
authorDaniel Lenski <dlenski@gmail.com>
Tue, 17 Nov 2020 20:29:22 +0000 (20:29 +0000)
committerDaniel Lenski <dlenski@gmail.com>
Tue, 17 Nov 2020 20:29:22 +0000 (20:29 +0000)
Enable insecure debugging

See merge request openconnect/openconnect!112

1  2 
configure.ac
main.c

diff --cc configure.ac
Simple merge
diff --cc main.c
index a46f7a0e3a38f11bddd2a180842c77de94bd01c7,cf3b5fdb3971b84afc3176c3d05b7c0e2358c22d..7978af221d42b902fbb6b5a7a7a7db1356d7e10b
--- 1/main.c
--- 2/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;