1 --- amanda-2.6.0/config/amanda/krb5-security.m4~ 2008-01-18 01:31:33.000000000 +0100
2 +++ amanda-2.6.0/config/amanda/krb5-security.m4 2008-05-13 11:41:28.000000000 +0200
4 AMANDA_ADD_LIBS([-lgssapi_krb5 -lkrb5 $K5CRYPTO $K5SUPPORT -lcom_err])
6 elif test \( -f ${k5libdir}/libkrb5.a -o -f ${k5libdir}/libkrb5.so \) -a \( -f ${k5libdir}/libasn1.a -o -f ${k5libdir}/libasn1.so \) -a \( -f ${k5libdir}/libgssapi.a -o -f ${k5libdir}/libgssapi.so \); then
8 + KRB5_LIBDIR_FOUND=$k5libdir
9 AMANDA_ADD_LIBS([-lgssapi -lkrb5 -lasn1])
10 AMANDA_ADD_CPPFLAGS([-DKRB5_HEIMDAL_INCLUDES])
12 --- amanda-2.6.0/common-src/krb5-security.c~ 2008-01-18 01:31:41.000000000 +0100
13 +++ amanda-2.6.0/common-src/krb5-security.c 2008-05-13 11:50:57.000000000 +0200
15 #include "sockaddr-util.h"
17 #ifdef KRB5_HEIMDAL_INCLUDES
19 +#include "et/com_err.h"
22 #define BROKEN_MEMORY_CCACHE
24 #ifndef KRB5_HEIMDAL_INCLUDES
25 #include <gssapi/gssapi_generic.h>
27 -#include <gssapi/gssapi.h>
32 --- amanda-2.6.0/common-src/security-util.h~ 2008-01-18 01:31:41.000000000 +0100
33 +++ amanda-2.6.0/common-src/security-util.h 2008-05-13 11:51:10.000000000 +0200
35 # ifndef KRB5_HEIMDAL_INCLUDES
36 # include <gssapi/gssapi_generic.h>
38 -# include <gssapi/gssapi.h>