fprintf(stderr, ...) → vpn_progress(stderr, VPN_ERR, ...)

These fprintf() calls occur in functions called with an active vpninfo,
not from main(). Therefore prefer vpn_progress() so that error messages
can be properly displayed, for example in a GUI.

Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>

diff --git a/mainloop.c b/mainloop.c
index a459dfb95a17138dc29deef42d0aa1034a514d8e..74f0f98c5b7b388733c810fc8ebb979acbab5868 100644 (file)
--- a/mainloop.c
+++ b/mainloop.c
@@ -118,14 +118,14 @@ static int setup_tun_device(struct openconnect_info *vpninfo)
        if (vpninfo->use_tun_script) {
                ret = openconnect_setup_tun_script(vpninfo, vpninfo->vpnc_script);
                if (ret) {
-                       fprintf(stderr, _("Set up tun script failed\n"));
+                       vpn_progress(vpninfo, PRG_ERR, _("Set up tun script failed\n"));
                        return ret;
                }
        } else
 #endif
        ret = openconnect_setup_tun_device(vpninfo, vpninfo->vpnc_script, vpninfo->ifname);
        if (ret) {
-               fprintf(stderr, _("Set up tun device failed\n"));
+               vpn_progress(vpninfo, PRG_ERR, _("Set up tun device failed\n"));
                if (!vpninfo->quit_reason)
                        vpninfo->quit_reason = "Set up tun device failed";
                return ret;
@@ -137,22 +137,22 @@ static int setup_tun_device(struct openconnect_info *vpninfo)
 
                if (setgid(vpninfo->gid)) {
                        e = errno;
-                       fprintf(stderr, _("Failed to set gid %ld: %s\n"),
-                               (long)vpninfo->gid, strerror(e));
+                       vpn_progress(vpninfo, PRG_ERR, _("Failed to set gid %ld: %s\n"),
+                                    (long)vpninfo->gid, strerror(e));
                        return -EPERM;
                }
 
                if (setgroups(1, &vpninfo->gid)) {
                        e = errno;
-                       fprintf(stderr, _("Failed to set groups to %ld: %s\n"),
-                               (long)vpninfo->gid, strerror(e));
+                       vpn_progress(vpninfo, PRG_ERR, _("Failed to set groups to %ld: %s\n"),
+                                    (long)vpninfo->gid, strerror(e));
                        return -EPERM;
                }
 
                if (setuid(vpninfo->uid)) {
                        e = errno;
-                       fprintf(stderr, _("Failed to set uid %ld: %s\n"),
-                               (long)vpninfo->uid, strerror(e));
+                       vpn_progress(vpninfo, PRG_ERR, _("Failed to set uid %ld: %s\n"),
+                                    (long)vpninfo->uid, strerror(e));
                        return -EPERM;
                }
        }