diff options
| author | assar <assar@NetBSD.org> | 2001-09-17 12:34:40 +0000 |
|---|---|---|
| committer | assar <assar@NetBSD.org> | 2001-09-17 12:34:40 +0000 |
| commit | 2a2aa85a8de56bd8f7a7358dbb9a35d90f398d3f (patch) | |
| tree | d20d72e4aa78755f12bf4ed922b13745954679b3 /include | |
| parent | 5b9616a3e3b715db465b5809f2b95ff425d8c526 (diff) | |
update infrastructure for krb4 1.1 and heimdal 0.4e
Diffstat (limited to 'include')
| -rw-r--r-- | include/heimdal/config.h | 124 | ||||
| -rw-r--r-- | include/heimdal/krb5-types.h | 4 | ||||
| -rw-r--r-- | include/heimdal/roken.h | 12 | ||||
| -rw-r--r-- | include/heimdal/version.h | 10 |
4 files changed, 87 insertions, 63 deletions
diff --git a/include/heimdal/config.h b/include/heimdal/config.h index 621e057ba63..acce71b1bc4 100644 --- a/include/heimdal/config.h +++ b/include/heimdal/config.h @@ -2,7 +2,8 @@ /* include/config.h.in. Generated automatically from configure.in by autoheader. */ #ifndef RCSID -#define RCSID(msg) static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg } +#define RCSID(msg) \ +static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg } #endif #define BINDIR "/usr/heimdal/bin" @@ -125,6 +126,12 @@ /* Define if you have the `daemon' function. */ #define HAVE_DAEMON 1 +/* define if you have a berkeley db1/2 library */ +#define HAVE_DB1 1 + +/* define if you have a berkeley db3 library */ +/* #undef HAVE_DB3 */ + /* Define if you have the `dbm_firstkey' function. */ #define HAVE_DBM_FIRSTKEY 1 @@ -132,7 +139,7 @@ /* #undef HAVE_DBM_H */ /* Define if you have the `dbopen' function. */ -/* #undef HAVE_DBOPEN */ +#define HAVE_DBOPEN 1 /* Define if you have the <db_185.h> header file. */ /* #undef HAVE_DB_185_H */ @@ -143,8 +150,8 @@ /* Define if you have the <db.h> header file. */ #define HAVE_DB_H 1 -/* Define if you have the `des_cbc_encrypt' function. */ -#define HAVE_DES_CBC_ENCRYPT 1 +/* define if you have ndbm compat in db */ +/* #undef HAVE_DB_NDBM */ /* Define if you have the <dirent.h> header file. */ #define HAVE_DIRENT_H 1 @@ -160,12 +167,21 @@ /* Define if you have the `dn_expand' function. */ #define HAVE_DN_EXPAND 1 +/* Define if you have the `ecalloc' function. */ +/* #undef HAVE_ECALLOC */ + /* Define if you have the `el_init' function. */ #define HAVE_EL_INIT 1 +/* Define if you have the `emalloc' function. */ +#define HAVE_EMALLOC 1 + /* define if your system declares environ */ /* #undef HAVE_ENVIRON_DECLARATION */ +/* Define if you have the `erealloc' function. */ +#define HAVE_EREALLOC 1 + /* Define if you have the `err' function. */ #define HAVE_ERR 1 @@ -178,6 +194,9 @@ /* Define if you have the <err.h> header file. */ #define HAVE_ERR_H 1 +/* Define if you have the `estrdup' function. */ +#define HAVE_ESTRDUP 1 + /* Define if you have the `fchown' function. */ #define HAVE_FCHOWN 1 @@ -266,7 +285,7 @@ #define HAVE_GETOPT 1 /* Define if you have the `getprogname' function. */ -/* #undef HAVE_GETPROGNAME */ +#define HAVE_GETPROGNAME 1 /* Define if you have the `getpwnam_r' function. */ /* #undef HAVE_GETPWNAM_R */ @@ -293,7 +312,7 @@ #define HAVE_GETUSERSHELL 1 /* define if you have a glob() that groks GLOB_BRACE, GLOB_NOCHECK, - GLOB_QUOTE, and GLOB_TILDE, and GLOB_LIMIT */ + GLOB_QUOTE, GLOB_TILDE, and GLOB_LIMIT */ #define HAVE_GLOB 1 /* Define if you have the `grantpt' function. */ @@ -326,6 +345,9 @@ /* Define if you have the <ifaddrs.h> header file. */ #define HAVE_IFADDRS_H 1 +/* Define if you have the in6addr_loopback variable */ +#define HAVE_IN6ADDR_LOOPBACK 1 + /* Define if you have the `inet_aton' function. */ #define HAVE_INET_ATON 1 @@ -338,6 +360,9 @@ /* Define if you have the `initgroups' function. */ #define HAVE_INITGROUPS 1 +/* Define if you have the `initstate' function. */ +#define HAVE_INITSTATE 1 + /* Define if you have the `innetgr' function. */ #define HAVE_INNETGR 1 @@ -353,6 +378,9 @@ /* Define if you have the `iruserok' function. */ #define HAVE_IRUSEROK 1 +/* Define if you have the `issetugid' function. */ +#define HAVE_ISSETUGID 1 + /* Define if you have the `krb_disable_debug' function. */ #define HAVE_KRB_DISABLE_DEBUG 1 @@ -362,9 +390,15 @@ /* Define if you have the `krb_get_our_ip_for_realm' function. */ #define HAVE_KRB_GET_OUR_IP_FOR_REALM 1 +/* Define if you have the <libutil.h> header file. */ +/* #undef HAVE_LIBUTIL_H */ + /* Define if you have the <limits.h> header file. */ #define HAVE_LIMITS_H 1 +/* Define if you have the `logout' function. */ +#define HAVE_LOGOUT 1 + /* Define if you have the `logwtmp' function. */ #define HAVE_LOGWTMP 1 @@ -377,21 +411,21 @@ /* Define if you have the <maillock.h> header file. */ /* #undef HAVE_MAILLOCK_H */ -/* Define if you have the `MD4_Init' function. */ -/* #undef HAVE_MD4_INIT */ - -/* Define if you have the `MD5_Init' function. */ -#define HAVE_MD5_INIT 1 - /* Define if you have the `memmove' function. */ #define HAVE_MEMMOVE 1 +/* Define if you have the <memory.h> header file. */ +#define HAVE_MEMORY_H 1 + /* Define if you have the `mkstemp' function. */ #define HAVE_MKSTEMP 1 /* Define if you have the `mktime' function. */ #define HAVE_MKTIME 1 +/* define if you have a ndbm library */ +#define HAVE_NDBM 1 + /* Define if you have the <ndbm.h> header file. */ #define HAVE_NDBM_H 1 @@ -434,20 +468,11 @@ /* Define if you have the <net/if.h> header file. */ #define HAVE_NET_IF_H 1 -/* Define if you have the <openssl/des.h> header file. */ -#define HAVE_OPENSSL_DES_H 1 - -/* Define if you have the <openssl/md4.h> header file. */ -#define HAVE_OPENSSL_MD4_H 1 - -/* Define if you have the <openssl/md5.h> header file. */ -#define HAVE_OPENSSL_MD5_H 1 +/* Define if you have the `openpty' function. */ +#define HAVE_OPENPTY 1 -/* Define if you have the <openssl/rc4.h> header file. */ -#define HAVE_OPENSSL_RC4_H 1 - -/* Define if you have the <openssl/sha.h> header file. */ -#define HAVE_OPENSSL_SHA_H 1 +/* define to use openssl's libcrypto */ +#define HAVE_OPENSSL 1 /* define if your system declares optarg */ #define HAVE_OPTARG_DECLARATION 1 @@ -491,9 +516,6 @@ /* Define if you have the `random' function. */ #define HAVE_RANDOM 1 -/* Define if you have the `RC4' function. */ -#define HAVE_RC4 1 - /* Define if you have the `rcmd' function. */ #define HAVE_RCMD 1 @@ -515,9 +537,6 @@ /* Define if you have the `revoke' function. */ #define HAVE_REVOKE 1 -/* Define if you have the <rpcsvc/dbm.h> header file. */ -/* #undef HAVE_RPCSVC_DBM_H */ - /* Define if you have the <rpcsvc/ypclnt.h> header file. */ #define HAVE_RPCSVC_YPCLNT_H 1 @@ -584,6 +603,9 @@ /* Define if you have the `setsockopt' function. */ #define HAVE_SETSOCKOPT 1 +/* Define if you have the `setstate' function. */ +#define HAVE_SETSTATE 1 + /* Define if you have the `setutent' function. */ /* #undef HAVE_SETUTENT */ @@ -593,9 +615,6 @@ /* Define if you have the <sgtty.h> header file. */ #define HAVE_SGTTY_H 1 -/* Define if you have the `SHA1_Init' function. */ -#define HAVE_SHA1_INIT 1 - /* Define if you have the <shadow.h> header file. */ /* #undef HAVE_SHADOW_H */ @@ -620,6 +639,12 @@ /* Define if you have the <standards.h> header file. */ /* #undef HAVE_STANDARDS_H */ +/* Define if you have the <stdint.h> header file. */ +#define HAVE_STDINT_H 1 + +/* Define if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + /* Define if you have the `strcasecmp' function. */ #define HAVE_STRCASECMP 1 @@ -632,6 +657,12 @@ /* Define if you have the `strftime' function. */ #define HAVE_STRFTIME 1 +/* Define if you have the <strings.h> header file. */ +#define HAVE_STRINGS_H 1 + +/* Define if you have the <string.h> header file. */ +#define HAVE_STRING_H 1 + /* Define if you have the `strlcat' function. */ #define HAVE_STRLCAT 1 @@ -962,9 +993,6 @@ /* Define if you have the `warnx' function. */ #define HAVE_WARNX 1 -/* Define if you have the <winsock.h> header file. */ -/* #undef HAVE_WINSOCK_H */ - /* Define if you have the `writev' function. */ #define HAVE_WRITEV 1 @@ -1004,12 +1032,6 @@ /* Define if you have the hesiod package. */ /* #undef HESIOD */ -/* Define if you want to use the KDC as a kaserver. */ -/* #undef KASERVER */ - -/* Define if you want support in hprop for reading kaserver databases */ -/* #undef KASERVER_DB */ - /* Define if you have the krb4 package. */ #define KRB4 1 @@ -1017,7 +1039,7 @@ #define KRB5 1 /* Define if krb_mk_req takes cons char * */ -#define KRB_MK_REQ_CONST 1 +/* #undef KRB_MK_REQ_CONST */ /* Define to zero if your krb.h doesn't */ /* #undef KRB_VERIFY_NOT_SECURE */ @@ -1123,7 +1145,7 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "0.3f" +#define VERSION "0.4e" /* Define if signal handlers return void. */ #define VOID_RETSIGTYPE 1 @@ -1251,14 +1273,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg } #define SGTTY #endif -/* - * Define NDBM if you are using the 4.3 ndbm library (which is part of - * libc). If not defined, 4.2 dbm will be assumed. - */ -#if defined(HAVE_DBM_FIRSTKEY) -#define NDBM -#endif - /* telnet stuff ----------------------------------------------- */ #if defined(ENCRYPTION) && !defined(AUTHENTICATION) @@ -1301,3 +1315,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg } # define WORDS_BIGENDIAN 1 # endif #endif + +#ifdef ROKEN_RENAME +#include "roken_rename.h" +#endif diff --git a/include/heimdal/krb5-types.h b/include/heimdal/krb5-types.h index fb5809c0b7e..e6da92103cd 100644 --- a/include/heimdal/krb5-types.h +++ b/include/heimdal/krb5-types.h @@ -1,5 +1,5 @@ -/* krb5-types.h -- this file was generated for i386-unknown-netbsd1.4P by - $Id: krb5-types.h,v 1.1.1.1 2000/06/16 19:18:30 thorpej Exp $ */ +/* krb5-types.h -- this file was generated for i386-unknown-netbsdelf1.5X by + $Id: krb5-types.h,v 1.2 2001/09/17 12:34:40 assar Exp $ */ #ifndef __krb5_types_h__ #define __krb5_types_h__ diff --git a/include/heimdal/roken.h b/include/heimdal/roken.h index 78a390e6ed3..7c8198d421d 100644 --- a/include/heimdal/roken.h +++ b/include/heimdal/roken.h @@ -38,7 +38,7 @@ * SUCH DAMAGE. */ -/* $Id: roken.h,v 1.5 2001/06/20 02:01:18 assar Exp $ */ +/* $Id: roken.h,v 1.6 2001/09/17 12:34:41 assar Exp $ */ #include <stdio.h> #include <stdlib.h> @@ -198,10 +198,16 @@ getnameinfo_verified(const struct sockaddr *sa, socklen_t salen, char *serv, size_t servlen, int flags); -int roken_getaddrinfo_hostspec(const char *, int, struct addrinfo **); +int roken_getaddrinfo_hostspec(const char *, int, struct addrinfo **); int roken_getaddrinfo_hostspec2(const char *, int, int, struct addrinfo **); +void *emalloc (size_t); +void *ecalloc(size_t num, size_t sz); + +void *erealloc (void *, size_t); + +char *estrdup (const char *); /* * kludges and such @@ -221,6 +227,6 @@ void set_progname(char *argv0); const char *get_progname(void); ROKEN_CPP_END -#define ROKEN_VERSION 0.3f +#define ROKEN_VERSION 0.4e #endif /* __ROKEN_H__ */ diff --git a/include/heimdal/version.h b/include/heimdal/version.h index 5a18abba7b1..948b92d7f45 100644 --- a/include/heimdal/version.h +++ b/include/heimdal/version.h @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.9 2001/06/20 02:01:18 assar Exp $ */ +/* $NetBSD: version.h,v 1.10 2001/09/17 12:34:41 assar Exp $ */ #if defined(__KRB5_VERSION) && !defined(__NO_KRB4_VERSION) #define heimdal_long_version __heimdal_long_version @@ -13,11 +13,11 @@ #endif #ifndef __NO_KRB5_VERSION -const char *heimdal_long_version = "@(#)$Version: heimdal-0.3f (NetBSD) $"; -const char *heimdal_version = "heimdal-0.3f"; +const char *heimdal_long_version = "@(#)$Version: heimdal-0.4e (NetBSD) $"; +const char *heimdal_version = "heimdal-0.4e"; #endif #ifndef __NO_KRB4_VERSION -const char *krb4_long_version = "@(#)$Version: krb4-1.0.5 (NetBSD) $"; -const char *krb4_version = "krb4-1.0.5"; +const char *krb4_long_version = "@(#)$Version: krb4-1.1 (NetBSD) $"; +const char *krb4_version = "krb4-1.1"; #endif |
