code freeze break request for Vino

[Mark McLoughlin <markmc redhat com>]

Hey,
	It turns out that when Vino is built without GNU TLS and the
require_encryption GConf key is set, then connecting to the server just
hangs without explanation. See:

  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=131354

	Appended is a trivial patch which I've tested and seems to work fine
under different configurations.

Cheers,
Mark.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/vino/ChangeLog,v
retrieving revision 1.55
diff -u -p -r1.55 ChangeLog
--- ChangeLog	31 Aug 2004 08:01:21 -0000	1.55
+++ ChangeLog	31 Aug 2004 16:31:29 -0000
@@ -0,0 +1,11 @@
+2004-08-31  Mark McLoughlin  <mark skynet ie>
+
+	Fixes bug where authentication would hang if built without
+	GNU TLS and require_encryption is TRUE.
+
+	* server/libvncserver/auth.c: append non-TLS security types
+	if built without GNU TLS.
+	
+	* server/vino-server.c: (vino_server_update_security_types):
+	Fix warning when built without GNU TLS.
+
Index: server/vino-server.c
===================================================================
RCS file: /cvs/gnome/vino/server/vino-server.c,v
retrieving revision 1.4
diff -u -p -r1.4 vino-server.c
--- server/vino-server.c	11 Aug 2004 18:08:17 -0000	1.4
+++ server/vino-server.c	31 Aug 2004 16:31:30 -0000
@@ -1044,14 +1044,18 @@ vino_server_update_security_types (VinoS
   if (server->priv->auth_methods & VINO_AUTH_VNC)
     {
       rfbAddAuthType (server->priv->rfb_screen, rfbVncAuth);
+#ifdef HAVE_GNUTLS
       if (!server->priv->require_encryption)
+#endif
 	rfbAddSecurityType (server->priv->rfb_screen, rfbVncAuth);
     }
       
   if (server->priv->auth_methods & VINO_AUTH_NONE)
     {
       rfbAddAuthType (server->priv->rfb_screen, rfbNoAuth);
+#ifdef HAVE_GNUTLS
       if (!server->priv->require_encryption)
+#endif
 	rfbAddSecurityType (server->priv->rfb_screen, rfbNoAuth);
     }
 }
Index: server/libvncserver/auth.c
===================================================================
RCS file: /cvs/gnome/vino/server/libvncserver/auth.c,v
retrieving revision 1.4
diff -u -p -r1.4 auth.c
--- server/libvncserver/auth.c	21 Jul 2004 13:35:27 -0000	1.4
+++ server/libvncserver/auth.c	31 Aug 2004 16:31:30 -0000
@@ -214,6 +214,7 @@ rfbAuthCleanupClient(rfbClientPtr cl)
 #endif /* HAVE_GNUTLS */
 }
 
+#ifdef HAVE_GNUTLS
 static void
 rfbAuthListAuthTypes(rfbClientPtr cl)
 {
@@ -234,6 +235,7 @@ rfbAuthListAuthTypes(rfbClientPtr cl)
         return;
     }
 }
+#endif /* HAVE_GNUTLS */
 
 void
 rfbAuthProcessSecurityTypeMessage(rfbClientPtr cl)