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/kadmin | |
| 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/kadmin')
| -rw-r--r-- | crypto/heimdal/kadmin/kadmin_locl.h | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/crypto/heimdal/kadmin/kadmin_locl.h b/crypto/heimdal/kadmin/kadmin_locl.h index aa5ba13..8c7e7d2 100644 --- a/crypto/heimdal/kadmin/kadmin_locl.h +++ b/crypto/heimdal/kadmin/kadmin_locl.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__ */ |
