fix merges from 0.3f
This commit is contained in:
Assar Westerlund
parent
362982da86
commit
c80b5a6353
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
|
||||
* Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* $Id: ktutil_locl.h,v 1.11 2000/02/07 04:26:37 assar Exp $
|
||||
* $Id: ktutil_locl.h,v 1.14 2001/05/10 15:42:45 assar Exp $
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
@ -55,7 +55,11 @@
|
||||
#include <parse_time.h>
|
||||
#include <roken.h>
|
||||
|
||||
#ifdef HAVE_OPENSSL_DES_H
|
||||
#include <openssl/des.h>
|
||||
#else
|
||||
#include <des.h>
|
||||
#endif
|
||||
|
||||
#include <krb5.h>
|
||||
#include <kadm5/admin.h>
|
||||
@ -65,10 +69,10 @@
|
||||
#include <getarg.h>
|
||||
|
||||
extern krb5_context context;
|
||||
extern krb5_keytab keytab;
|
||||
|
||||
extern int verbose_flag;
|
||||
extern char *keytab_string;
|
||||
extern char keytab_buf[256];
|
||||
|
||||
int kt_add (int argc, char **argv);
|
||||
int kt_change (int argc, char **argv);
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/* $Id: ftp_locl.h,v 1.34 1999/12/02 16:58:29 joda Exp $ */
|
||||
/* $Id: ftp_locl.h,v 1.35 2001/02/15 04:20:51 assar Exp $ */
|
||||
/* $FreeBSD$ */
|
||||
|
||||
#ifndef __FTP_LOCL_H__
|
||||
@ -130,7 +130,13 @@ struct hostent *gethostbyname(const char *);
|
||||
|
||||
#include "roken.h"
|
||||
#include "security.h"
|
||||
#include <openssl/des.h> /* for des_read_pw_string */
|
||||
|
||||
/* des_read_pw_string */
|
||||
#ifdef HAVE_OPENSSL_DES_H
|
||||
#include <openssl/des.h>
|
||||
#else
|
||||
#include <des.h>
|
||||
#endif
|
||||
|
||||
#if defined(__sun__) && !defined(__svr4)
|
||||
int fclose(FILE*);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997-2000 Kungliga Tekniska Högskolan
|
||||
* Copyright (c) 1997-2001 Kungliga Tekniska Högskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* $Id: kadmin_locl.h,v 1.25 2000/02/06 05:16:35 assar Exp $
|
||||
* $Id: kadmin_locl.h,v 1.36 2001/05/07 05:32:04 assar Exp $
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
@ -84,7 +84,11 @@
|
||||
#endif
|
||||
#include <err.h>
|
||||
#include <roken.h>
|
||||
#ifdef HAVE_OPENSSL_DES_H
|
||||
#include <openssl/des.h>
|
||||
#else
|
||||
#include <des.h>
|
||||
#endif
|
||||
#include <krb5.h>
|
||||
#include <krb5_locl.h>
|
||||
#include <hdb.h>
|
||||
@ -153,6 +157,7 @@ int set_entry(krb5_context context,
|
||||
int
|
||||
foreach_principal(const char *exp,
|
||||
int (*func)(krb5_principal, void*),
|
||||
const char *funcname,
|
||||
void *data);
|
||||
|
||||
void get_response(const char *prompt, const char *def, char *buf, size_t len);
|
||||
@ -177,7 +182,7 @@ random_password(char *pw, size_t len);
|
||||
|
||||
/* kadm_conn.c */
|
||||
|
||||
sig_atomic_t term_flag, doing_useful_work;
|
||||
extern sig_atomic_t term_flag, doing_useful_work;
|
||||
|
||||
void parse_ports(krb5_context, const char*);
|
||||
int start_server(krb5_context);
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* $Id: headers.h,v 1.6 2000/02/06 06:04:36 assar Exp $
|
||||
* $Id: headers.h,v 1.11 2001/02/15 04:20:53 assar Exp $
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
@ -83,7 +83,11 @@
|
||||
#include <getarg.h>
|
||||
#include <base64.h>
|
||||
#include <parse_units.h>
|
||||
#ifdef HAVE_OPENSSL_DES_H
|
||||
#include <openssl/des.h>
|
||||
#else
|
||||
#include <des.h>
|
||||
#endif
|
||||
#include <krb5.h>
|
||||
#include <krb5_locl.h>
|
||||
#include <hdb.h>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997-2000 Kungliga Tekniska Högskolan
|
||||
* Copyright (c) 1997-2001 Kungliga Tekniska Högskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/* $Id: hdb_locl.h,v 1.13 2000/02/06 05:17:05 assar Exp $ */
|
||||
/* $Id: hdb_locl.h,v 1.15 2001/02/15 04:20:54 assar Exp $ */
|
||||
/* $FreeBSD$ */
|
||||
|
||||
#ifndef __HDB_LOCL_H__
|
||||
@ -57,7 +57,11 @@
|
||||
#endif
|
||||
#include <roken.h>
|
||||
|
||||
#ifdef HAVE_OPENSSL_DES_H
|
||||
#include <openssl/des.h>
|
||||
#else
|
||||
#include <des.h>
|
||||
#endif
|
||||
#include <krb5.h>
|
||||
#include <hdb.h>
|
||||
#include <hdb-private.h>
|
||||
@ -74,14 +78,4 @@
|
||||
#include <gdbm/ndbm.h>
|
||||
#endif
|
||||
|
||||
int hdb_principal2key(krb5_context, krb5_principal, krb5_data*);
|
||||
int hdb_key2principal(krb5_context, krb5_data*, krb5_principal);
|
||||
|
||||
krb5_error_code hdb_lock(int, int);
|
||||
krb5_error_code hdb_unlock(int);
|
||||
|
||||
krb5_error_code _hdb_fetch(krb5_context, HDB*, unsigned, hdb_entry*);
|
||||
krb5_error_code _hdb_store(krb5_context, HDB*, unsigned, hdb_entry*);
|
||||
krb5_error_code _hdb_remove(krb5_context, HDB*, hdb_entry*);
|
||||
|
||||
#endif /* __HDB_LOCL_H__ */
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/* $Id: krb5_locl.h,v 1.63 1999/12/02 17:05:11 joda Exp $ */
|
||||
/* $Id: krb5_locl.h,v 1.66 2001/05/10 15:31:34 assar Exp $ */
|
||||
/* $FreeBSD$ */
|
||||
|
||||
#ifndef __KRB5_LOCL_H__
|
||||
@ -136,7 +136,7 @@ struct sockaddr_dl;
|
||||
#include <rc4.h>
|
||||
#endif
|
||||
|
||||
#include <asn1.h>
|
||||
#include <krb5_asn1.h>
|
||||
#include <der.h>
|
||||
|
||||
#include <krb5.h>
|
||||
@ -148,7 +148,8 @@ struct sockaddr_dl;
|
||||
#define ALLOC_SEQ(X, N) do { (X)->len = (N); ALLOC((X)->val, (N)); } while(0)
|
||||
|
||||
/* should this be public? */
|
||||
#define KEYTAB_DEFAULT "FILE:/etc/krb5.keytab"
|
||||
#define KEYTAB_DEFAULT "ANY:FILE:/etc/krb5.keytab,krb4:/etc/srvtab"
|
||||
#define KEYTAB_DEFAULT_MODIFY "FILE:/etc/krb5.keytab"
|
||||
|
||||
#ifndef O_BINARY
|
||||
#define O_BINARY 0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user