[patch] 0.6.2 source code patch for sasl2 openssl integration

pam_mysql-0.6.2.patch (text/plain), 2.22 KB, created by Cyrius on 2006-04-07 14:07:48 UTC

diff -Naur ./AUTHORS ./AUTHORS
--- ./AUTHORS	1970-01-01 01:00:00.000000000 +0100
+++ ./AUTHORS	2006-02-19 16:15:02.000000000 +0100
@@ -0,0 +1 @@
+Cyrius
diff -Naur ./acinclude.m4 ./acinclude.m4
--- ./acinclude.m4	2005-09-22 06:40:45.000000000 +0200
+++ ./acinclude.m4	2006-02-19 16:15:07.000000000 +0100
@@ -355,7 +355,7 @@
   sasl_v2_lib_name="sasl2"
 
   for _pfx in $1; do
-    for dir in "$_pfx/include/sasl_v1" "$_pfx/include/sasl_v2" "$_pfx/include"; do
+    for dir in "$_pfx/include/sasl_v1" "$_pfx/include/sasl" "$_pfx/include"; do
       if test -e "$dir/sasl.h" -a -z "$sasl_v2_CFLAGS"; then
         ac_save_CPPFLAGS="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -I$dir"
@@ -382,7 +382,7 @@
         LIBS="$LIBS -L$dir"
         name="$sasl_v2_lib_name"
         if eval test -e "$dir/$libname_spec$shrext_cmds" -o -e "$dir/$libname_spec.$libext"; then
-          AC_CHECK_LIB([$sasl_v2_lib_name], [sasl_v2_client_init], [
+          AC_CHECK_LIB([$sasl_v2_lib_name], [sasl_client_init], [
             sasl_v2_LIBS="-L$dir -l$sasl_v2_lib_name"
           ],[]) 
         fi
@@ -401,8 +401,8 @@
 AC_DEFUN([PAM_MYSQL_CHECK_MD5_HEADERS], [
   AC_MSG_CHECKING([if md5.h is derived from Cyrus SASL Version 1])
   AC_TRY_COMPILE([
-#include <md5global.h>
-#include <md5.h>
+#include <sasl/md5global.h>
+#include <sasl/md5.h>
   ], [
 MD5_CTX ctx;
 _sasl_MD5Init(&ctx);
@@ -418,13 +418,13 @@
 
   AC_MSG_CHECKING([if md5.h is Solaris's])
   AC_TRY_COMPILE([
-#include <md5.h>
+#include <openssl/md5.h>
   ], [
-md5_calc(0, 0, 0);
+MD5(0, 0, 0);
   ], [
     AC_MSG_RESULT([yes])
     AC_DEFINE([HAVE_SOLARIS_MD5_H], [1], [Define to 1 if md5.h in the include path is Solaris's])
-    AC_CHECK_LIB([md5], [md5_calc], [
+    AC_CHECK_LIB([md5], [MD5], [
       AC_DEFINE([HAVE_SOLARIS_LIBMD5], [1], [Define to 1 if Solaris's libmd5 is available])
       LIBS="$LIBS -lmd5"
     ])
diff -Naur ./pam_mysql.c ./pam_mysql.c
--- ./pam_mysql.c	2005-09-22 11:22:27.000000000 +0200
+++ ./pam_mysql.c	2006-02-19 16:15:14.000000000 +0100
@@ -106,8 +106,8 @@
 
 #if defined(HAVE_SASL_MD5_H) && (defined(HAVE_CYRUS_SASL_V1) || defined(HAVE_CYRUS_SASL_V2))
 #define USE_SASL_MD5
-#include <md5global.h>
-#include <md5.h>
+#include <sasl/md5global.h>
+#include <sasl/md5.h>
 #endif
 #endif