59c037738d
from version 2.1.19 include: * Fixes to cram plugin to avoid attempting to canonify uninitialized data (This removes the need for patch-af). * NTLM portability fixes. * Avoid potential attack using SASL_PATH when sasl is used in a setuid environment. * A trivial number of small bugfixes.
25 lines
1 KiB
Text
25 lines
1 KiB
Text
$NetBSD: patch-ab,v 1.8 2004/11/15 21:58:17 jlam Exp $
|
|
|
|
--- aclocal.m4.orig 2004-10-24 16:21:05.000000000 -0400
|
|
+++ aclocal.m4
|
|
@@ -1678,7 +1678,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
|
|
LIBS="$saved_LIBS -l$dbname"
|
|
AC_TRY_LINK([#include <db.h>],
|
|
[db_create(NULL, NULL, 0);],
|
|
- BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
|
|
+ BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db; break,
|
|
dblib="no")
|
|
done
|
|
if test "$dblib" = "no"; then
|
|
@@ -2923,7 +2923,10 @@ AC_DEFUN([SASL_GSSAPI_CHK],[
|
|
AC_MSG_RESULT(with implementation ${gss_impl})
|
|
AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv")
|
|
SASL_MECHS="$SASL_MECHS libgssapiv2.la"
|
|
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
|
|
+ if test "$enable_static" = yes; then
|
|
+ SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
|
|
+ AC_DEFINE(STATIC_GSSAPIV2, [], [Link GSSAPI Staticly])
|
|
+ fi
|
|
|
|
cmu_save_LIBS="$LIBS"
|
|
LIBS="$LIBS $GSSAPIBASE_LIBS"
|