X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Ftls.el;h=42ae5920eee90e83c21fbe652c759784c2886956;hb=4fc3db870a731a7582cc77dc5f8436268adb58ed;hp=9a1b0bb66100f3f69af4782b9f6470bd92789163;hpb=9a8731d6dea8021a10dec1b42f382609336a9aa9;p=gnus

diff --git a/lisp/tls.el b/lisp/tls.el
index 9a1b0bb66..42ae5920e 100644
--- a/lisp/tls.el
+++ b/lisp/tls.el
@@ -1,7 +1,6 @@
 ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2002-2011  Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: comm, tls, gnutls, ssl
@@ -75,8 +74,8 @@ and `gnutls-cli' (version 2.0.1) output."
   :type 'regexp
   :group 'tls)
 
-(defcustom tls-program '("gnutls-cli -p %p %h"
-			 "gnutls-cli -p %p %h --protocols ssl3"
+(defcustom tls-program '("gnutls-cli --insecure -p %p %h"
+			 "gnutls-cli --insecure -p %p %h --protocols ssl3"
 			 "openssl s_client -connect %h:%p -no_ssl2 -ign_eof")
   "List of strings containing commands to start TLS stream to a host.
 Each entry in the list is tried until a connection is successful.
@@ -238,6 +237,10 @@ Fourth arg PORT is an integer specifying a port to connect to."
 	  (setq process (start-process
 			 name buffer shell-file-name shell-command-switch
 			 formatted-cmd))
+	  (funcall (if (fboundp 'set-process-query-on-exit-flag)
+		       'set-process-query-on-exit-flag
+		     'process-kill-without-query)
+		   process nil)
 	  (while (and process
 		      (memq (process-status process) '(open run))
 		      (progn
@@ -298,5 +301,4 @@ match `%s'. Connect anyway? " host))))))
 
 (provide 'tls)
 
-;; arch-tag: 5596d1c4-facc-4bc4-94a9-9863b928d7ac
 ;;; tls.el ends here