X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fgnutls.c;h=6d30a5d5c66f58caf5882affe12c632cb7562ee4;hb=293008f682e5fa9726136bc121bceadc136c77dc;hp=5480cde34392b31b52dd1210e5b901678bdf1e5c;hpb=d78cd8d8f8e12d1b71ac19795131d6975abe544b;p=wget

diff --git a/src/gnutls.c b/src/gnutls.c
index 5480cde3..6d30a5d5 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1,5 +1,6 @@
 /* SSL support via GnuTLS library.
-   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+   Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -164,11 +165,7 @@ wgnutls_close (int fd, void *arg)
   /*gnutls_bye (ctx->session, GNUTLS_SHUT_RDWR);*/
   gnutls_deinit (ctx->session);
   xfree (ctx);
-#ifndef WINDOWS
   close (fd);
-#else
-  closesocket (fd);
-#endif
 }
 
 /* gnutls_transport is the singleton that describes the SSL transport
@@ -180,7 +177,7 @@ static struct transport_implementation wgnutls_transport = {
 };
 
 bool
-ssl_connect (int fd) 
+ssl_connect (int fd)
 {
   static const int cert_type_priority[] = {
     GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0
@@ -290,8 +287,8 @@ ssl_check_certificate (int fd, const char *host)
       if (!gnutls_x509_crt_check_hostname (cert, host))
         {
           logprintf (LOG_NOTQUIET,
-                     _("The certificate's owner does not match hostname '%s'\n"),
-                     host);
+                     _("The certificate's owner does not match hostname %s\n"),
+                     quote (host));
           success = false;
         }
       gnutls_x509_crt_deinit (cert);