[Emacs-diffs] Changes to emacs/lisp/gnus/nntp.el

[ShengHuo ZHU]

Index: emacs/lisp/gnus/nntp.el
diff -c emacs/lisp/gnus/nntp.el:1.18 emacs/lisp/gnus/nntp.el:1.19
*** emacs/lisp/gnus/nntp.el:1.18        Tue Feb 11 12:00:27 2003
--- emacs/lisp/gnus/nntp.el     Fri Feb 28 08:36:11 2003
***************
*** 1,7 ****
  ;;; nntp.el --- nntp access for Gnus
  ;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996,
! ;;        1997, 1998, 2000, 2001, 2002
! ;;        Free Software Foundation, Inc.
  
  ;; Author: Lars Magne Ingebrigtsen <address@hidden>
  ;; Keywords: news
--- 1,7 ----
  ;;; nntp.el --- nntp access for Gnus
+ 
  ;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996,
! ;; 1997, 1998, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  
  ;; Author: Lars Magne Ingebrigtsen <address@hidden>
  ;; Keywords: news
***************
*** 223,231 ****
  (defvar nntp-async-timer nil)
  (defvar nntp-async-process-list nil)
  
  (eval-and-compile
!   (autoload 'mail-source-read-passwd "mail-source")
!   (autoload 'open-ssl-stream "ssl"))
  
  
  
--- 223,237 ----
  (defvar nntp-async-timer nil)
  (defvar nntp-async-process-list nil)
  
+ (defvar nntp-ssl-program 
+   "openssl s_client -quiet -ssl3 -connect %s:%p"
+ "A string containing commands for SSL connections.
+ Within a string, %s is replaced with the server address and %p with
+ port number on server.  The program should accept IMAP commands on
+ stdin and return responses to stdout.")
+ 
  (eval-and-compile
!   (autoload 'mail-source-read-passwd "mail-source"))
  
  
  
***************
*** 921,928 ****
    (open-network-stream "nntpd" buffer nntp-address nntp-port-number))
  
  (defun nntp-open-ssl-stream (buffer)
!   (let* ((ssl-program-arguments '("-connect" (concat host ":" service)))
!        (proc (open-ssl-stream "nntpd" buffer nntp-address nntp-port-number)))
      (save-excursion
        (set-buffer buffer)
        (nntp-wait-for-string "^\r*20[01]")
--- 927,941 ----
    (open-network-stream "nntpd" buffer nntp-address nntp-port-number))
  
  (defun nntp-open-ssl-stream (buffer)
!   (let* ((process-connection-type nil)
!        (proc (start-process "nntpd" buffer 
!                             shell-file-name
!                             shell-command-switch
!                             (format-spec nntp-ssl-program 
!                                          (format-spec-make
!                                           ?s nntp-address
!                                           ?p nntp-port-number)))))
!     (process-kill-without-query proc)
      (save-excursion
        (set-buffer buffer)
        (nntp-wait-for-string "^\r*20[01]")