projects / packages / amanda.git / blame
| 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 | |
| 34 | @@ -51,7 +51,7 @@ | |
| 35 | # ifndef KRB5_HEIMDAL_INCLUDES | |
| 36 | # include <gssapi/gssapi_generic.h> | |
| 37 | # else | |
| 38 | -# include <gssapi/gssapi.h> | |
| 39 | +# include <gssapi.h> | |
| 40 | # endif | |
| 41 | # include <krb5.h> | |
| 42 | #endif | |
| 7e011e26 JR |
43 | --- amanda-2.6.1p1/common-src/security-util.h~ 2009-12-09 15:20:43.091037399 +0100 |
| 44 | +++ amanda-2.6.1p1/common-src/security-util.h 2009-12-09 15:21:33.612974357 +0100 | |
| 45 | @@ -47,10 +47,10 @@ | |
| 46 | ||
| 47 | ||
| 48 | #ifdef KRB5_SECURITY | |
| 49 | -# define KRB5_DEPRECATED 1 | |
| 50 | # ifndef KRB5_HEIMDAL_INCLUDES | |
| 51 | +# define KRB5_DEPRECATED 1 | |
| 52 | # include <gssapi/gssapi_generic.h> | |
| 53 | # else | |
| 54 | # include <gssapi.h> | |
| 55 | # endif | |
| 56 | # include <krb5.h> |