Attachment #84168 for bug #123405

Line 0 Link Here

(-)./AUTHORS (+1 lines)
	1	test




  sasl_v2_lib_name="sasl2"

  for _pfx in $1; do
    for dir in "$_pfx/include/sasl_v1" "$_pfx/include/sasl"; do
      if test -e "$dir/sasl.h" -a -z "$sasl_v2_CFLAGS"; then
        ac_save_CPPFLAGS="$CPPFLAGS"
        CPPFLAGS="$CPPFLAGS -I$dir"

        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_client_init], [
            sasl_v2_LIBS="-L$dir -l$sasl_v2_lib_name"
          ],[]) 
        fi

AC_DEFUN([PAM_MYSQL_CHECK_MD5_HEADERS], [
  AC_MSG_CHECKING([if md5.h is derived from Cyrus SASL Version 1])
  AC_TRY_COMPILE([
#include <sasl/md5global.h>
#include <sasl/md5.h>
  ], [
MD5_CTX ctx;
_sasl_MD5Init(&ctx);


  AC_MSG_CHECKING([if md5.h is Solaris's])
  AC_TRY_COMPILE([
#include <openssl/md5.h>
  ], [
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], [
      AC_DEFINE([HAVE_SOLARIS_LIBMD5], [1], [Define to 1 if Solaris's libmd5 is available])
      LIBS="$LIBS -lmd5"
    ])

Lines 42-48 Link Here

(-)./configure.in (-1 / +2 lines)
42	], [ELOOP EOVERFLOW])	42	], [ELOOP EOVERFLOW])
43	PAM_MYSQL_CHECK_NETWORK_LIBS	43	PAM_MYSQL_CHECK_NETWORK_LIBS
44	AC_CHECK_FUNCS([inet_ntop getaddrinfo freeaddrinfo strcasecmp strdup])	44	AC_CHECK_FUNCS([inet_ntop getaddrinfo freeaddrinfo strcasecmp strdup])
45	PAM_MYSQL_CHECK_IPV6	45	AC_ARG_WITH([ipv6], [ --with-ipv6 Specify the use of ipv6 protocol],
		46	[ PAM_MYSQL_CHECK_IPV6 ])
46	PAM_MYSQL_CHECK_GETHOSTBYNAME_R	47	PAM_MYSQL_CHECK_GETHOSTBYNAME_R
47		48
48	AC_CHECK_SIZEOF([char])	49	AC_CHECK_SIZEOF([char])

Lines 126-133 Link Here

(-)./pam_mysql.c (-2 / +2 lines)
126		126
127	#if defined(HAVE_SASL_MD5_H) && (defined(HAVE_CYRUS_SASL_V1) \|\| defined(HAVE_CYRUS_SASL_V2))	127	#if defined(HAVE_SASL_MD5_H) && (defined(HAVE_CYRUS_SASL_V1) \|\| defined(HAVE_CYRUS_SASL_V2))
128	#define USE_SASL_MD5	128	#define USE_SASL_MD5
129	#include <md5global.h>	129	#include <sasl/md5global.h>
130	#include <md5.h>	130	#include <sasl/md5.h>
131	#endif	131	#endif
132	#endif	132	#endif

Return to bug 123405

Lines 368-374 Link Here

(-)./acinclude.m4 (-7 / +7 lines)
368	sasl_v2_lib_name="sasl2"	368	sasl_v2_lib_name="sasl2"
369		369
370	for _pfx in $1; do	370	for _pfx in $1; do
371	for dir in "$_pfx/include/sasl_v1" "$_pfx/include/sasl_v2" "$_pfx/include"; do	371	for dir in "$_pfx/include/sasl_v1" "$_pfx/include/sasl"; do
372	if test -e "$dir/sasl.h" -a -z "$sasl_v2_CFLAGS"; then	372	if test -e "$dir/sasl.h" -a -z "$sasl_v2_CFLAGS"; then
373	ac_save_CPPFLAGS="$CPPFLAGS"	373	ac_save_CPPFLAGS="$CPPFLAGS"
374	CPPFLAGS="$CPPFLAGS -I$dir"	374	CPPFLAGS="$CPPFLAGS -I$dir"
Lines 395-401 Link Here
395	LIBS="$LIBS -L$dir"	395	LIBS="$LIBS -L$dir"
396	name="$sasl_v2_lib_name"	396	name="$sasl_v2_lib_name"
397	if eval test -e "$dir/$libname_spec$shrext_cmds" -o -e "$dir/$libname_spec.$libext"; then	397	if eval test -e "$dir/$libname_spec$shrext_cmds" -o -e "$dir/$libname_spec.$libext"; then
398	AC_CHECK_LIB([$sasl_v2_lib_name], [sasl_v2_client_init], [	398	AC_CHECK_LIB([$sasl_v2_lib_name], [sasl_client_init], [
399	sasl_v2_LIBS="-L$dir -l$sasl_v2_lib_name"	399	sasl_v2_LIBS="-L$dir -l$sasl_v2_lib_name"
400	],[])	400	],[])
401	fi	401	fi
Lines 414-421 Link Here
414	AC_DEFUN([PAM_MYSQL_CHECK_MD5_HEADERS], [	414	AC_DEFUN([PAM_MYSQL_CHECK_MD5_HEADERS], [
415	AC_MSG_CHECKING([if md5.h is derived from Cyrus SASL Version 1])	415	AC_MSG_CHECKING([if md5.h is derived from Cyrus SASL Version 1])
416	AC_TRY_COMPILE([	416	AC_TRY_COMPILE([
417	#include <md5global.h>	417	#include <sasl/md5global.h>
418	#include <md5.h>	418	#include <sasl/md5.h>
419	], [	419	], [
420	MD5_CTX ctx;	420	MD5_CTX ctx;
421	_sasl_MD5Init(&ctx);	421	_sasl_MD5Init(&ctx);
Lines 431-443 Link Here
431		431
432	AC_MSG_CHECKING([if md5.h is Solaris's])	432	AC_MSG_CHECKING([if md5.h is Solaris's])
433	AC_TRY_COMPILE([	433	AC_TRY_COMPILE([
434	#include <md5.h>	434	#include <openssl/md5.h>
435	], [	435	], [
436	md5_calc(0, 0, 0);	436	MD5(0, 0, 0);
437	], [	437	], [
438	AC_MSG_RESULT([yes])	438	AC_MSG_RESULT([yes])
439	AC_DEFINE([HAVE_SOLARIS_MD5_H], [1], [Define to 1 if md5.h in the include path is Solaris's])	439	AC_DEFINE([HAVE_SOLARIS_MD5_H], [1], [Define to 1 if md5.h in the include path is Solaris's])
440	AC_CHECK_LIB([md5], [md5_calc], [	440	AC_CHECK_LIB([md5], [MD5], [
441	AC_DEFINE([HAVE_SOLARIS_LIBMD5], [1], [Define to 1 if Solaris's libmd5 is available])	441	AC_DEFINE([HAVE_SOLARIS_LIBMD5], [1], [Define to 1 if Solaris's libmd5 is available])
442	LIBS="$LIBS -lmd5"	442	LIBS="$LIBS -lmd5"
443	])	443	])