fix conflicts in heimdal 0.3e import
This commit is contained in:
parent
c25d7ab741
commit
47085b17ae
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=72448
@ -52,6 +52,7 @@
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#include <parse_time.h>
|
||||
#include <roken.h>
|
||||
|
||||
#include <openssl/des.h>
|
||||
|
@ -47,15 +47,22 @@
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#ifdef HAVE_SYS_SELECT_H
|
||||
#include <sys/select.h>
|
||||
#endif
|
||||
#ifdef HAVE_FCNTL_H
|
||||
#include <fcntl.h>
|
||||
#endif
|
||||
#ifdef HAVE_SYS_SOCKET_H
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
#ifdef HAVE_SYS_SELECT_H
|
||||
#include <sys/select.h>
|
||||
#endif
|
||||
#ifdef HAVE_NETINET_IN_H
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
@ -66,6 +73,9 @@
|
||||
#include <netinet6/in6.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_UTIL_H
|
||||
#include <util.h>
|
||||
#endif
|
||||
#ifdef HAVE_NETDB_H
|
||||
#include <netdb.h>
|
||||
#endif
|
||||
@ -76,6 +86,7 @@
|
||||
#include <roken.h>
|
||||
#include <openssl/des.h>
|
||||
#include <krb5.h>
|
||||
#include <krb5_locl.h>
|
||||
#include <hdb.h>
|
||||
#include <hdb_err.h>
|
||||
#include <kadm5/admin.h>
|
||||
@ -107,6 +118,7 @@ DECL(dump);
|
||||
DECL(load);
|
||||
DECL(merge);
|
||||
|
||||
#undef ALLOC
|
||||
#define ALLOC(X) ((X) = malloc(sizeof(*(X))))
|
||||
|
||||
/* util.c */
|
||||
@ -145,6 +157,9 @@ foreach_principal(const char *exp,
|
||||
|
||||
void get_response(const char *prompt, const char *def, char *buf, size_t len);
|
||||
|
||||
int parse_des_key (const char *key_string,
|
||||
krb5_key_data *key_data, const char **err);
|
||||
|
||||
/* server.c */
|
||||
|
||||
krb5_error_code
|
||||
@ -153,11 +168,23 @@ kadmind_loop (krb5_context, krb5_auth_context, krb5_keytab, int);
|
||||
/* version4.c */
|
||||
|
||||
void
|
||||
handle_v4(krb5_context context, int len, int fd);
|
||||
handle_v4(krb5_context context, krb5_keytab keytab, int len, int fd);
|
||||
|
||||
/* random_password.c */
|
||||
|
||||
void
|
||||
random_password(char *pw, size_t len);
|
||||
|
||||
/* kadm_conn.c */
|
||||
|
||||
sig_atomic_t term_flag, doing_useful_work;
|
||||
|
||||
void parse_ports(krb5_context, const char*);
|
||||
int start_server(krb5_context);
|
||||
|
||||
/* server.c */
|
||||
|
||||
krb5_error_code
|
||||
kadmind_loop (krb5_context, krb5_auth_context, krb5_keytab, int);
|
||||
|
||||
#endif /* __ADMIN_LOCL_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__ */
|
||||
|
@ -68,8 +68,10 @@
|
||||
#include <db.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_NDBM_H
|
||||
#if defined(HAVE_NDBM_H)
|
||||
#include <ndbm.h>
|
||||
#elif defined(HAVE_GDBM_NDBM_H)
|
||||
#include <gdbm/ndbm.h>
|
||||
#endif
|
||||
|
||||
int hdb_principal2key(krb5_context, krb5_principal, krb5_data*);
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997-1999 Kungliga Tekniska Högskolan
|
||||
* Copyright (c) 1997-2001 Kungliga Tekniska Högskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@ -110,11 +110,35 @@ struct sockaddr_dl;
|
||||
#include <parse_time.h>
|
||||
#include <base64.h>
|
||||
|
||||
<<<<<<< krb5_locl.h
|
||||
#include <openssl/des.h>
|
||||
=======
|
||||
#ifdef HAVE_OPENSSL_DES_H
|
||||
#include <openssl/des.h>
|
||||
#else
|
||||
#include <des.h>
|
||||
#endif
|
||||
#ifdef HAVE_OPENSSL_MD4_H
|
||||
#include <openssl/md4.h>
|
||||
#else
|
||||
>>>>>>> 1.1.1.2
|
||||
#include <md4.h>
|
||||
#endif
|
||||
#ifdef HAVE_OPENSSL_MD5_H
|
||||
#include <openssl/md5.h>
|
||||
#else
|
||||
#include <md5.h>
|
||||
#endif
|
||||
#ifdef HAVE_OPENSSL_SHA_H
|
||||
#include <openssl/sha.h>
|
||||
#else
|
||||
#include <sha.h>
|
||||
#endif
|
||||
#ifdef HAVE_OPENSSL_RC4_H
|
||||
#include <openssl/rc4.h>
|
||||
#else
|
||||
#include <rc4.h>
|
||||
#endif
|
||||
|
||||
#include <asn1.h>
|
||||
#include <der.h>
|
||||
|
Loading…
Reference in New Issue
Block a user