r1749: *** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 246c6158d3f6dd1cfe03c825b4097912e654d0e3..fa48676fc3641fe66342d21438582e2db2a7b199 100644 (file)
--- 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 43afd02b968e0863cd10738652ebdcd7d4c0b324..907140c259111eab5bd64e171794f9e7645e2cc6 100644 (file)
--- 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 0ee7d8a8fe0ee2911714260dee5288631cd67b4c..9eae607266d5b51217148182b81fca2b8986e8a2 100644 (file)
--- 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)