[Xfce4-commits] <xfce4-session:xfce-4.8> Only perform hostname checks when TCP connections are enabled.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
         to 91244191e7908f0e2bb91e174830f69501570147 (commit)
       from 16fa0b300a029bdc4cf65767c073d40a7a1871b2 (commit)

commit 91244191e7908f0e2bb91e174830f69501570147
Author: Benedikt Meurer <benedikt.meurer at googlemail.com>
Date:   Tue Jul 26 08:19:09 2011 +0200

    Only perform hostname checks when TCP connections are enabled.
    
    Based on a patch from Guido Berhoerster <gber at opensuse.org>.
    
    (cherry picked from commit ba231e2eee82c321f473687e425d455fb36205d9)

 xfce4-session/main.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/xfce4-session/main.c b/xfce4-session/main.c
index fcf69f8..aa06c99 100644
--- a/xfce4-session/main.c
+++ b/xfce4-session/main.c
@@ -254,9 +254,12 @@ main (int argc, char **argv)
   dpy = gdk_display_get_default ();
   init_display (manager, dpy, channel, opt_disable_tcp);
 
-  /* verify that the DNS settings are ok */
-  xfsm_splash_screen_next (splash_screen, _("Verifying DNS settings"));
-  xfsm_dns_check ();
+  if (!opt_disable_tcp && xfconf_channel_get_bool (channel, "/security/EnableTcp", FALSE))
+    {
+      /* verify that the DNS settings are ok */
+      xfsm_splash_screen_next (splash_screen, _("Verifying DNS settings"));
+      xfsm_dns_check ();
+    }
 
   xfsm_splash_screen_next (splash_screen, _("Loading session data"));