projects / packages / amanda.git / blame
| Commit | Line | Data |
|---|---|---|
| 9564c161 JR |
1 | diff -urNp -x '*.orig' amanda-3.5.1.org/common-src/krb5-security.c amanda-3.5.1/common-src/krb5-security.c |
| 2 | --- amanda-3.5.1.org/common-src/krb5-security.c 2017-12-01 14:26:28.000000000 +0100 | |
| 3 | +++ amanda-3.5.1/common-src/krb5-security.c 2021-05-08 10:23:14.430132083 +0200 | |
| 4 | @@ -43,7 +43,7 @@ | |
| 9aec15c3 JR |
5 | #include "sockaddr-util.h" |
| 6 | ||
| 7 | #ifdef KRB5_HEIMDAL_INCLUDES | |
| 8 | -#include "com_err.h" | |
| 9 | +#include "et/com_err.h" | |
| 10 | #endif | |
| 11 | ||
| 12 | #define BROKEN_MEMORY_CCACHE | |
| 9564c161 | 13 | @@ -65,7 +65,7 @@ |
| 4f6c48fe JR |
14 | #ifndef KRB5_HEIMDAL_INCLUDES |
| 15 | #include <gssapi/gssapi_generic.h> | |
| 16 | #else | |
| 17 | -#include <gssapi/gssapi.h> | |
| 18 | +#include <gssapi.h> | |
| 19 | #endif | |
| 20 | #include <krb5.h> | |
| 21 | ||
| 9564c161 JR |
22 | diff -urNp -x '*.orig' amanda-3.5.1.org/common-src/security-util.h amanda-3.5.1/common-src/security-util.h |
| 23 | --- amanda-3.5.1.org/common-src/security-util.h 2017-12-01 14:26:28.000000000 +0100 | |
| 24 | +++ amanda-3.5.1/common-src/security-util.h 2021-05-08 10:23:14.430132083 +0200 | |
| 25 | @@ -53,11 +53,11 @@ | |
| 26 | #define H_EOF -2 /* this connection has been shut down */ | |
| 7e011e26 JR |
27 | |
| 28 | #ifdef KRB5_SECURITY | |
| 29 | -# define KRB5_DEPRECATED 1 | |
| 30 | # ifndef KRB5_HEIMDAL_INCLUDES | |
| 31 | +# define KRB5_DEPRECATED 1 | |
| 32 | # include <gssapi/gssapi_generic.h> | |
| 33 | # else | |
| b2a21571 JR |
34 | -# include <gssapi/gssapi.h> |
| 35 | +# include <gssapi.h> | |
| 7e011e26 JR |
36 | # endif |
| 37 | # include <krb5.h> | |
| b2a21571 | 38 | #endif |
| 9564c161 JR |
39 | diff -urNp -x '*.orig' amanda-3.5.1.org/config/amanda/krb5-security.m4 amanda-3.5.1/config/amanda/krb5-security.m4 |
| 40 | --- amanda-3.5.1.org/config/amanda/krb5-security.m4 2017-12-01 14:26:31.000000000 +0100 | |
| 41 | +++ amanda-3.5.1/config/amanda/krb5-security.m4 2021-05-08 10:23:14.430132083 +0200 | |
| 42 | @@ -61,6 +61,8 @@ AC_DEFUN([AMANDA_KRB5_SECURITY], | |
| 43 | AMANDA_ADD_LIBS([-lgssapi_krb5 -lkrb5 $K5CRYPTO $K5SUPPORT -lcom_err]) | |
| 44 | break | |
| 45 | 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 | |
| 46 | + KRB5_DIR_FOUND=$dir | |
| 47 | + KRB5_LIBDIR_FOUND=$k5libdir | |
| 48 | AMANDA_ADD_LIBS([-lgssapi -lkrb5 -lasn1]) | |
| 49 | AMANDA_ADD_CPPFLAGS([-DKRB5_HEIMDAL_INCLUDES]) | |
| 50 | break |