]>
Commit | Line | Data |
---|---|---|
e3dd0b48 JR |
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 | |
3 | @@ -69,6 +69,8 @@ | |
4 | AMANDA_ADD_LIBS([-lgssapi_krb5 -lkrb5 $K5CRYPTO $K5SUPPORT -lcom_err]) | |
5 | break | |
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 | |
7 | + KRB5_DIR_FOUND=$dir | |
8 | + KRB5_LIBDIR_FOUND=$k5libdir | |
9 | AMANDA_ADD_LIBS([-lgssapi -lkrb5 -lasn1]) | |
10 | AMANDA_ADD_CPPFLAGS([-DKRB5_HEIMDAL_INCLUDES]) | |
11 | break | |
4f6c48fe JR |
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 | |
9aec15c3 JR |
14 | @@ -45,7 +45,7 @@ |
15 | #include "sockaddr-util.h" | |
16 | ||
17 | #ifdef KRB5_HEIMDAL_INCLUDES | |
18 | -#include "com_err.h" | |
19 | +#include "et/com_err.h" | |
20 | #endif | |
21 | ||
22 | #define BROKEN_MEMORY_CCACHE | |
4f6c48fe JR |
23 | @@ -67,7 +67,7 @@ |
24 | #ifndef KRB5_HEIMDAL_INCLUDES | |
25 | #include <gssapi/gssapi_generic.h> | |
26 | #else | |
27 | -#include <gssapi/gssapi.h> | |
28 | +#include <gssapi.h> | |
29 | #endif | |
30 | #include <krb5.h> | |
31 | ||
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 | |
b2a21571 | 34 | @@ -47,11 +47,11 @@ |
7e011e26 JR |
35 | |
36 | ||
37 | #ifdef KRB5_SECURITY | |
38 | -# define KRB5_DEPRECATED 1 | |
39 | # ifndef KRB5_HEIMDAL_INCLUDES | |
40 | +# define KRB5_DEPRECATED 1 | |
41 | # include <gssapi/gssapi_generic.h> | |
42 | # else | |
b2a21571 JR |
43 | -# include <gssapi/gssapi.h> |
44 | +# include <gssapi.h> | |
7e011e26 JR |
45 | # endif |
46 | # include <krb5.h> | |
b2a21571 | 47 | #endif |