Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 123405 | Differences between
and this patch

Collapse All | Expand All

(-)./AUTHORS (+1 lines)
Line 0 Link Here
1
Cyrius
(-)./acinclude.m4 (-7 / +7 lines)
Lines 355-361 Link Here
355
  sasl_v2_lib_name="sasl2"
355
  sasl_v2_lib_name="sasl2"
356
356
357
  for _pfx in $1; do
357
  for _pfx in $1; do
358
    for dir in "$_pfx/include/sasl_v1" "$_pfx/include/sasl_v2" "$_pfx/include"; do
358
    for dir in "$_pfx/include/sasl_v1" "$_pfx/include/sasl" "$_pfx/include"; do
359
      if test -e "$dir/sasl.h" -a -z "$sasl_v2_CFLAGS"; then
359
      if test -e "$dir/sasl.h" -a -z "$sasl_v2_CFLAGS"; then
360
        ac_save_CPPFLAGS="$CPPFLAGS"
360
        ac_save_CPPFLAGS="$CPPFLAGS"
361
        CPPFLAGS="$CPPFLAGS -I$dir"
361
        CPPFLAGS="$CPPFLAGS -I$dir"
Lines 382-388 Link Here
382
        LIBS="$LIBS -L$dir"
382
        LIBS="$LIBS -L$dir"
383
        name="$sasl_v2_lib_name"
383
        name="$sasl_v2_lib_name"
384
        if eval test -e "$dir/$libname_spec$shrext_cmds" -o -e "$dir/$libname_spec.$libext"; then
384
        if eval test -e "$dir/$libname_spec$shrext_cmds" -o -e "$dir/$libname_spec.$libext"; then
385
          AC_CHECK_LIB([$sasl_v2_lib_name], [sasl_v2_client_init], [
385
          AC_CHECK_LIB([$sasl_v2_lib_name], [sasl_client_init], [
386
            sasl_v2_LIBS="-L$dir -l$sasl_v2_lib_name"
386
            sasl_v2_LIBS="-L$dir -l$sasl_v2_lib_name"
387
          ],[]) 
387
          ],[]) 
388
        fi
388
        fi
Lines 401-408 Link Here
401
AC_DEFUN([PAM_MYSQL_CHECK_MD5_HEADERS], [
401
AC_DEFUN([PAM_MYSQL_CHECK_MD5_HEADERS], [
402
  AC_MSG_CHECKING([if md5.h is derived from Cyrus SASL Version 1])
402
  AC_MSG_CHECKING([if md5.h is derived from Cyrus SASL Version 1])
403
  AC_TRY_COMPILE([
403
  AC_TRY_COMPILE([
404
#include <md5global.h>
404
#include <sasl/md5global.h>
405
#include <md5.h>
405
#include <sasl/md5.h>
406
  ], [
406
  ], [
407
MD5_CTX ctx;
407
MD5_CTX ctx;
408
_sasl_MD5Init(&ctx);
408
_sasl_MD5Init(&ctx);
Lines 418-430 Link Here
418
418
419
  AC_MSG_CHECKING([if md5.h is Solaris's])
419
  AC_MSG_CHECKING([if md5.h is Solaris's])
420
  AC_TRY_COMPILE([
420
  AC_TRY_COMPILE([
421
#include <md5.h>
421
#include <openssl/md5.h>
422
  ], [
422
  ], [
423
md5_calc(0, 0, 0);
423
MD5(0, 0, 0);
424
  ], [
424
  ], [
425
    AC_MSG_RESULT([yes])
425
    AC_MSG_RESULT([yes])
426
    AC_DEFINE([HAVE_SOLARIS_MD5_H], [1], [Define to 1 if md5.h in the include path is Solaris's])
426
    AC_DEFINE([HAVE_SOLARIS_MD5_H], [1], [Define to 1 if md5.h in the include path is Solaris's])
427
    AC_CHECK_LIB([md5], [md5_calc], [
427
    AC_CHECK_LIB([md5], [MD5], [
428
      AC_DEFINE([HAVE_SOLARIS_LIBMD5], [1], [Define to 1 if Solaris's libmd5 is available])
428
      AC_DEFINE([HAVE_SOLARIS_LIBMD5], [1], [Define to 1 if Solaris's libmd5 is available])
429
      LIBS="$LIBS -lmd5"
429
      LIBS="$LIBS -lmd5"
430
    ])
430
    ])
(-)./pam_mysql.c (-2 / +2 lines)
Lines 106-113 Link Here
106
106
107
#if defined(HAVE_SASL_MD5_H) && (defined(HAVE_CYRUS_SASL_V1) || defined(HAVE_CYRUS_SASL_V2))
107
#if defined(HAVE_SASL_MD5_H) && (defined(HAVE_CYRUS_SASL_V1) || defined(HAVE_CYRUS_SASL_V2))
108
#define USE_SASL_MD5
108
#define USE_SASL_MD5
109
#include <md5global.h>
109
#include <sasl/md5global.h>
110
#include <md5.h>
110
#include <sasl/md5.h>
111
#endif
111
#endif
112
#endif
112
#endif
113
113

Return to bug 123405