Mercurial > hg > xemacs-beta
view lisp/cus-file.el @ 5887:6eca500211f4
Prototype for X509_check_host() has changed, detect this in configure.ac
ChangeLog addition:
2015-04-09 Aidan Kehoe <kehoea@parhasard.net>
* configure.ac:
If X509_check_host() is available, check the number of arguments
it takes. Don't use it if it takes any number of arguments other
than five. Also don't use it if <openssl/x509v3.h> does not
declare it, since if that is so there is no portable way to tell
how many arguments it should take, and so we would end up smashing
the stack.
* configure: Regenerate.
src/ChangeLog addition:
2015-04-09 Aidan Kehoe <kehoea@parhasard.net>
* tls.c:
#include <openssl/x509v3.h> for its prototype for
X509_check_host().
* tls.c (tls_open):
Pass the new fifth argument to X509_check_host().
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Thu, 09 Apr 2015 14:27:02 +0100 |
parents | 8861440b1aa4 |
children |
line wrap: on
line source
;;; cus-file.el --- Manage location of the customize init file ;; Copyright (C) 2000 by Free Software Foundation, Inc. ;; Author: Mike Sperber <mike@xemacs.org> ;; Keywords: internal ;; This file is part of XEmacs. ;; XEmacs 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 3 of the License, or (at your ;; option) any later version. ;; XEmacs 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 XEmacs. If not, see <http://www.gnu.org/licenses/>. ;;; Synched up with: Not in FSF ;;; Commentary: ;; This file manages the location of the custom init file without ;; loading all of the custom code itself. ;;; Code: (provide 'cus-file) (defconst custom-file-base "custom.el" "Base of file name for storing customization information.") (defvar custom-file nil "File used for storing customization information. If you change this from the default you need to explicitly load that file for the settings to take effect.") (defun make-custom-file-name (init-file &optional force-new) "Construct the default custom file name from the init file name. If FORCE-NEW is non-nil, force post-migration location." (let ((init-file (or init-file user-init-file))) (if (or force-new (not init-file) (string= (file-name-directory init-file) (expand-file-name (file-name-as-directory user-init-directory)))) (expand-file-name custom-file-base user-init-directory) init-file))) ;;; cus-file.el ends here