diff options
| author | assar <assar@FreeBSD.org> | 2001-02-13 16:52:56 +0000 |
|---|---|---|
| committer | assar <assar@FreeBSD.org> | 2001-02-13 16:52:56 +0000 |
| commit | e1ae34cd7eb529ac68cc6fed2f6d240dcde73c7b (patch) | |
| tree | cfc4903cd4bd37cedc93bdd80f27c7a0ef96e4cf /crypto/heimdal/kdc | |
| parent | 3a971fe69aad52dfd248901ae796e64a96ae3e37 (diff) | |
| download | FreeBSD-src-e1ae34cd7eb529ac68cc6fed2f6d240dcde73c7b.zip FreeBSD-src-e1ae34cd7eb529ac68cc6fed2f6d240dcde73c7b.tar.gz | |
fix conflicts in heimdal 0.3e import
Diffstat (limited to 'crypto/heimdal/kdc')
| -rw-r--r-- | crypto/heimdal/kdc/headers.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/crypto/heimdal/kdc/headers.h b/crypto/heimdal/kdc/headers.h index 118e0d8..16df783 100644 --- a/crypto/heimdal/kdc/headers.h +++ b/crypto/heimdal/kdc/headers.h @@ -75,6 +75,9 @@ #ifdef HAVE_NETDB_H #include <netdb.h> #endif +#ifdef HAVE_UTIL_H +#include <util.h> +#endif #include <err.h> #include <roken.h> #include <getarg.h> @@ -82,6 +85,7 @@ #include <parse_units.h> #include <openssl/des.h> #include <krb5.h> +#include <krb5_locl.h> #include <hdb.h> #include <hdb_err.h> #include <der.h> /* copy_octet_string */ @@ -93,6 +97,10 @@ #include <krb_db.h> #endif +#undef ALLOC #define ALLOC(X) ((X) = malloc(sizeof(*(X)))) +#undef ALLOC_SEQ +#define ALLOC_SEQ(X, N) do { (X)->len = (N); \ +(X)->val = calloc((X)->len, sizeof(*(X)->val)); } while(0) #endif /* __HEADERS_H__ */ |
