[Emacs-diffs] Changes to emacs/lisp/url/url-auth.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/url/url-auth.el
diff -c emacs/lisp/url/url-auth.el:1.4.2.1 emacs/lisp/url/url-auth.el:1.4.2.2
*** emacs/lisp/url/url-auth.el:1.4.2.1  Thu Oct 14 08:49:52 2004
--- emacs/lisp/url/url-auth.el  Fri Oct 22 10:13:34 2004
***************
*** 1,26 ****
  ;;; url-auth.el --- Uniform Resource Locator authorization modules
  ;; Keywords: comm, data, processes, hypermedia
  
! 
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
! ;;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
! ;;;
! ;;; This file is part of GNU Emacs.
! ;;;
! ;;; GNU Emacs is free software; you can redistribute it and/or modify
! ;;; it under the terms of the GNU General Public License as published by
! ;;; the Free Software Foundation; either version 2, or (at your option)
! ;;; any later version.
! ;;;
! ;;; GNU Emacs is distributed in the hope that it will be useful,
! ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
! ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! ;;; GNU General Public License for more details.
! ;;;
! ;;; You should have received a copy of the GNU General Public License
! ;;; along with GNU Emacs; see the file COPYING.  If not, write to the
! ;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! ;;; Boston, MA 02111-1307, USA.
! 
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
  (require 'url-vars)
  (require 'url-parse)
--- 1,27 ----
  ;;; url-auth.el --- Uniform Resource Locator authorization modules
+ 
+ ;; Copyright (c) 1996 - 1999 Free Software Foundation, Inc.
+ 
  ;; Keywords: comm, data, processes, hypermedia
  
! ;; This file is part of GNU Emacs.
! 
! ;; GNU Emacs is free software; you can redistribute it and/or modify
! ;; it under the terms of the GNU General Public License as published by
! ;; the Free Software Foundation; either version 2, or (at your option)
! ;; any later version.
! 
! ;; GNU Emacs is distributed in the hope that it will be useful,
! ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
! ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! ;; GNU General Public License for more details.
! 
! ;; You should have received a copy of the GNU General Public License
! ;; along with GNU Emacs; see the file COPYING.  If not, write to the
! ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! ;; Boston, MA 02111-1307, USA.
! 
! ;;; Code:
  
  (require 'url-vars)
  (require 'url-parse)
***************
*** 78,84 ****
       ((and prompt (not byserv))
        (setq user (read-string (url-auth-user-prompt url realm)
                              (user-real-login-name))
!           pass (funcall url-passwd-entry-func "Password: "))
        (set url-basic-auth-storage
           (cons (list server
                       (cons path
--- 79,85 ----
       ((and prompt (not byserv))
        (setq user (read-string (url-auth-user-prompt url realm)
                              (user-real-login-name))
!           pass (read-passwd "Password: "))
        (set url-basic-auth-storage
           (cons (list server
                       (cons path
***************
*** 102,108 ****
          (progn
            (setq user (read-string (url-auth-user-prompt url realm)
                                    (user-real-login-name))
!                 pass (funcall url-passwd-entry-func "Password: ")
                  retval (base64-encode-string (format "%s:%s" user pass))
                  byserv (assoc server (symbol-value url-basic-auth-storage)))
            (setcdr byserv
--- 103,109 ----
          (progn
            (setq user (read-string (url-auth-user-prompt url realm)
                                    (user-real-login-name))
!                 pass (read-passwd "Password: ")
                  retval (base64-encode-string (format "%s:%s" user pass))
                  byserv (assoc server (symbol-value url-basic-auth-storage)))
            (setcdr byserv
***************
*** 160,166 ****
         ((and prompt (not byserv))
          (setq user (read-string (url-auth-user-prompt url realm)
                                  (user-real-login-name))
!               pass (funcall url-passwd-entry-func "Password: ")
                url-digest-auth-storage
                (cons (list server
                            (cons path
--- 161,167 ----
         ((and prompt (not byserv))
          (setq user (read-string (url-auth-user-prompt url realm)
                                  (user-real-login-name))
!               pass (read-passwd "Password: ")
                url-digest-auth-storage
                (cons (list server
                            (cons path
***************
*** 187,193 ****
              (progn
                (setq user (read-string (url-auth-user-prompt url realm)
                                        (user-real-login-name))
!                     pass (funcall url-passwd-entry-func "Password: ")
                      retval (setq retval
                                   (cons user
                                         (url-digest-auth-create-key
--- 188,194 ----
              (progn
                (setq user (read-string (url-auth-user-prompt url realm)
                                        (user-real-login-name))
!                     pass (read-passwd "Password: ")
                      retval (setq retval
                                   (cons user
                                         (url-digest-auth-create-key
***************
*** 314,316 ****
--- 315,318 ----
  (provide 'url-auth)
  
  ;;; arch-tag: 04058625-616d-44e4-9dbf-4b46b00b2a91
+ ;;; url-auth.el ends here