From a48c0d8fe6629d25f72fae1d7def32e29ac3a8ed Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 6 Apr 2002 23:23:47 +0000 Subject: [PATCH] r1749: *** empty log message *** --- ChangeLog | 4 +++- VERSION | 2 +- .../postgresql-socket/postgresql-socket-api.cl | 17 ++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 246c615..fa48676 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,9 @@ Updated find-forieign-library support. * interfaces/postgresql-socket/postgresql-socket-package.cl: Fixed require form for Lispworks (Thanks Marc Battyani!) - + * interfaces/postgresql-socket/postgresql-socket-api.cl: + Fixed eval of def-function for crypt library. + 31 Mar 2002 Kevin Rosenberg (kevin@rosenberg.net) * Added interface to support USQL high-level rouines diff --git a/VERSION b/VERSION index 43afd02..907140c 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -0.6.4 +0.6.5 diff --git a/interfaces/postgresql-socket/postgresql-socket-api.cl b/interfaces/postgresql-socket/postgresql-socket-api.cl index 0ee7d8a..9eae607 100644 --- a/interfaces/postgresql-socket/postgresql-socket-api.cl +++ b/interfaces/postgresql-socket/postgresql-socket-api.cl @@ -9,7 +9,7 @@ ;;;; ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: postgresql-socket-api.cl,v 1.12 2002/03/27 12:09:39 kevin Exp $ +;;;; $Id: postgresql-socket-api.cl,v 1.13 2002/04/06 23:23:47 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai @@ -219,19 +219,18 @@ socket interface" ;;; Support for encrypted password transmission -(defconstant +crypt-library+ "/usr/lib/libcrypt.so" - "Name of the shared library to load in order to access the crypt -function named by `*crypt-function-name*'.") - (defvar *crypt-library-loaded* nil) (defun crypt-password (password salt) "Encrypt a password for transmission to a PostgreSQL server." (unless *crypt-library-loaded* - (uffi:load-foreign-library +crypt-library+ :supporting-libaries '("c")) - (eval (uffi:def-function "crypt" - ((key :cstring) - (salt :cstring)) + (uffi:load-foreign-library + (find-foreign-library "libcrypt" + '("/usr/lib/" "/usr/local/lib/" "/lib/")) + :supporting-libaries '("c")) + (eval '(uffi:def-function "crypt" + ((key :cstring) + (salt :cstring)) :returning :cstring)) (setq *crypt-library-loaded* t)) (uffi:with-cstring (password-cstring password) -- 2.34.1