[Midnightbsd-cvs] src [7146] trunk/kerberos5/include: tag
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jul 25 15:18:31 EDT 2015
Revision: 7146
http://svnweb.midnightbsd.org/src/?rev=7146
Author: laffer1
Date: 2015-07-25 15:18:30 -0400 (Sat, 25 Jul 2015)
Log Message:
-----------
tag
Modified Paths:
--------------
trunk/kerberos5/include/config.h
trunk/kerberos5/include/crypto-headers.h
trunk/kerberos5/include/krb5-types.h
trunk/kerberos5/include/version.h
Removed Paths:
-------------
trunk/kerberos5/include/NTMakefile
trunk/kerberos5/include/heim_threads.h
trunk/kerberos5/include/krb5-types.cross
Deleted: trunk/kerberos5/include/NTMakefile
===================================================================
--- trunk/kerberos5/include/NTMakefile 2015-07-25 19:18:22 UTC (rev 7145)
+++ trunk/kerberos5/include/NTMakefile 2015-07-25 19:18:30 UTC (rev 7146)
@@ -1,119 +0,0 @@
-########################################################################
-#
-# Copyright (c) 2009, Secure Endpoints Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# - Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# - Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-RELDIR=include
-
-SUBDIRS=kadm5 hcrypto gssapi
-
-!include ../windows/NTMakefile.w32
-!include ../windows/NTMakefile.version
-!include ../windows/NTMakefile.config
-
-INCFILES= \
- $(INCDIR)\config.h \
- $(INCDIR)\crypto-headers.h \
- $(INCDIR)\heim_threads.h \
- $(INCDIR)\krb5-types.h \
- $(INCDIR)\version.h
-
-$(INCDIR)\krb5-types.h: $(OBJ)\bits.exe
- $(OBJ)\bits.exe $(INCDIR)\krb5-types.h
-
-$(OBJ)\bits.exe: $(OBJ)\bits.obj
- $(EXECONLINK)
- $(EXEPREP_NODIST)
-
-$(INCDIR)\config.h: config.h.w32 ..\windows\NTMakefile.config ..\windows\NTMakefile.version NTMakefile
- $(PERL) << < config.h.w32 > $@
-
-while(<>) {
-
- if (m/\@FEATURE_DEFS\@/) {
-
- if ("$(KRB5)") { print "#define KRB5 1\n"; }
- if ("$(KRB4)") { print "#define KRB4 1\n"; }
- if ("$(WEAK_CRYPTO)") { print "#define HEIM_WEAK_CRYPTO 1\n"; }
- if ("$(PKINIT)") { print "#define PKINIT 1\n"; }
- if ("$(NO_AFS)") { print "#define NO_AFS 1\n"; }
- if ("$(OPENLDAP)") { print "#define OPENLDAP 1\n"; }
- if ("$(OPENLDAP_MODULE)") { print "#define OPENLDAP_MODULE 1\n"; }
- if ("$(OTP)") { print "#define OTP 1 \n"; }
- if ("$(AUTHENTICATION)") { print "#define AUTHENTICATION 1\n"; }
- if ("$(DIAGNOSTICS)") { print "#define DIAGNOSTICS 1\n"; }
- if ("$(ENCRYPTION)") { print "#define ENCRYPTION 1\n"; }
- if ("$(ENABLE_AFS_STRING_TO_KEY)") { print "#define ENABLE_AFS_STRING_TO_KEY 1\n"; }
- if ("$(ENABLE_PTHREAD_SUPPORT)") { print "#define ENABLE_PTHREAD_SUPPORT 1\n"; }
- if ("$(HAVE_PTHREAD_H)") { print "#define HAVE_PTHREAD_H 1\n"; }
- if ("$(ENV_HACK)") { print "#define ENV_HACK 1\n"; }
- if ("$(HAVE_KCM)") { print "#define HAVE_KCM 1\n"; }
- if ("$(HAVE_SCC)") { print "#define HAVE_SCC 1\n"; }
- if ("$(DIR_hdbdir)") { print "#define HDB_DB_DIR \"".'$(DIR_hdbdir)'."\"\n"; }
- if ("$(HAVE_MSLSA_CACHE)") { print "#define HAVE_MSLSA_CACHE 1\n"; }
- if ("$(NO_LOCALNAME)") { print "#define NO_LOCALNAME 1\n"; }
-
- } elsif (m/\@VERSION_OPTDEFS\@/) {
-
- if ("$(VER_PRERELEASE)") { print "#define VER_PRERELEASE 1\n"; }
- if ("$(VER_PRIVATE)") { print "#define VER_PRIVATE \"$(VER_PRIVATE)\"\n"; }
- if ("$(VER_SPECIAL)") { print "#define VER_SPECIAL \"$(VER_SPECIAL)\"\n"; }
- if ("$(BUILD)" =~ "dbg") { print "#define VER_DEBUG 1\n"; }
- print "#define HOST \"$(COMPUTERNAME)\"\n";
-
- } else {
-
- s/\@PACKAGE\@/$(VER_PACKAGE)/;
- s/\@PACKAGE_NAME\@/$(VER_PACKAGE_NAME)/;
- s/\@PACKAGE_BUGREPORT\@/$(VER_PACKAGE_BUGREPORT:@=\@)/;
- s/\@PACKAGE_VERSION\@/$(VER_PACKAGE_VERSION)/;
- s/\@PACKAGE_COPYRIGHT\@/$(VER_PACKAGE_COPYRIGHT)/;
- s/\@PACKAGE_COMPANY\@/$(VER_PACKAGE_COMPANY)/;
- s/\@MAJOR\@/$(VER_PRODUCT_MAJOR)/;
- s/\@MINOR\@/$(VER_PRODUCT_MINOR)/;
- s/\@AUX\@/$(VER_PRODUCT_AUX)/;
- s/\@PATCH\@/$(VER_PRODUCT_PATCH)/;
-
- print $_;
- }
-}
-
-<<
-
-$(INCDIR)\version.h: ..\windows\NTMakefile.version NTMakefile
- $(CP) << $@
-const char *heimdal_long_version = "@(#)$$Version: $(VER_PACKAGE_NAME) $(VER_PACKAGE_VERSION) by $(USERNAME) on $(COMPUTERNAME) ($(CPU)-pc-windows) $$";
-const char *heimdal_version = "$(VER_PACKAGE_NAME) $(VER_PACKAGE_VERSION)";
-<<
-
-all:: $(INCFILES)
-
-clean::
- -$(RM) $(INCFILES)
-
Modified: trunk/kerberos5/include/config.h
===================================================================
--- trunk/kerberos5/include/config.h 2015-07-25 19:18:22 UTC (rev 7145)
+++ trunk/kerberos5/include/config.h 2015-07-25 19:18:30 UTC (rev 7146)
@@ -1,10 +1,9 @@
/* include/config.h. Generated from config.h.in by configure. */
-/* include/config.h.in. Generated from configure.in by autoheader. */
+/* include/config.h.in. Generated from configure.ac by autoheader. */
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/kerberos5/include/config.h 234027 2012-04-08 08:19:17Z stas $ */
-#include <osreldate.h>
-
#ifndef RCSID
#define RCSID(msg) \
static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
@@ -17,11 +16,15 @@
#ifdef BUILD_KRB5_LIB
-#ifndef KRB5_LIB_FUNCTION
+#ifndef KRB5_LIB
#ifdef _WIN32_
-#define KRB5_LIB_FUNCTION _export _stdcall
+#define KRB5_LIB_FUNCTION __declspec(dllexport)
+#define KRB5_LIB_CALL __stdcall
+#define KRB5_LIB_VARIABLE __declspec(dllexport)
#else
#define KRB5_LIB_FUNCTION
+#define KRB5_LIB_CALL
+#define KRB5_LIB_VARIABLE
#endif
#endif
#endif
@@ -28,16 +31,35 @@
#ifdef BUILD_ROKEN_LIB
-#ifndef ROKEN_LIB_FUNCTION
+#ifndef ROKEN_LIB
#ifdef _WIN32_
-#define ROKEN_LIB_FUNCTION _export _stdcall
+#define ROKEN_LIB_FUNCTION __declspec(dllexport)
+#define ROKEN_LIB_CALL __stdcall
+#define ROKEN_LIB_VARIABLE __declspec(dllexport)
#else
#define ROKEN_LIB_FUNCTION
+#define ROKEN_LIB_CALL
+#define ROKEN_LIB_VARIABLE
#endif
#endif
#endif
+#ifdef BUILD_GSSAPI_LIB
+#ifndef GSSAPI_LIB
+#ifdef _WIN32_
+#define GSSAPI_LIB_FUNCTION __declspec(dllexport)
+#define GSSAPI_LIB_CALL __stdcall
+#define GSSAPI_LIB_VARIABLE __declspec(dllexport)
+#else
+#define GSSAPI_LIB_FUNCTION
+#define GSSAPI_LIB_CALL
+#define GSSAPI_LIB_VARIABLE
+#endif
+#endif
+#endif
+
+
/* Define if you want authentication support in telnet. */
#define AUTHENTICATION 1
@@ -56,11 +78,14 @@
/* Define this to enable diagnostics in telnet. */
#define DIAGNOSTICS 1
+/* Define to enable DIGEST. */
+#define DIGEST 1
+
/* Define if want to use the weak AFS string to key functions. */
#define ENABLE_AFS_STRING_TO_KEY 1
/* Define if you want have a thread safe libraries */
-/* #undef ENABLE_PTHREAD_SUPPORT */
+#define ENABLE_PTHREAD_SUPPORT 1
/* Define if you want encryption support in telnet. */
#define ENCRYPTION 1
@@ -73,7 +98,7 @@
/* define if prototype of gethostbyaddr is compatible with struct hostent
*gethostbyaddr(const void *, size_t, int) */
-#define GETHOSTBYADDR_PROTO_COMPATIBLE 1
+/* #undef GETHOSTBYADDR_PROTO_COMPATIBLE */
/* define if prototype of gethostbyname is compatible with struct hostent
*gethostbyname(const char *) */
@@ -105,6 +130,9 @@
/* Define to 1 if you have the <arpa/telnet.h> header file. */
#define HAVE_ARPA_TELNET_H 1
+/* Define to 1 if you have the <asl.h> header file. */
+/* #undef HAVE_ASL_H */
+
/* Define to 1 if you have the `asnprintf' function. */
/* #undef HAVE_ASNPRINTF */
@@ -114,6 +142,9 @@
/* Define to 1 if you have the `atexit' function. */
#define HAVE_ATEXIT 1
+/* Define to 1 if you have the `backtrace' function. */
+/* #undef HAVE_BACKTRACE */
+
/* Define to 1 if you have the <bind/bitypes.h> header file. */
/* #undef HAVE_BIND_BITYPES_H */
@@ -129,6 +160,9 @@
/* Define to 1 if you have the <capability.h> header file. */
/* #undef HAVE_CAPABILITY_H */
+/* whether capng is available for privilege reduction */
+/* #undef HAVE_CAPNG */
+
/* Define to 1 if you have the `cap_set_proc' function. */
/* #undef HAVE_CAP_SET_PROC */
@@ -139,8 +173,14 @@
#define HAVE_CHOWN 1
/* Define if you have the function `closefrom'. */
-#define HAVE_CLOSEFROM
+#define HAVE_CLOSEFROM 1
+/* Define to 1 if you have the <CommonCrypto/CommonCryptor.h> header file. */
+/* #undef HAVE_COMMONCRYPTO_COMMONCRYPTOR_H */
+
+/* Define to 1 if you have the <CommonCrypto/CommonDigest.h> header file. */
+/* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */
+
/* Define to 1 if you have the <config.h> header file. */
/* #undef HAVE_CONFIG_H */
@@ -162,7 +202,7 @@
/* define if you have a berkeley db1/2 library */
#define HAVE_DB1 1
-/* define if you have a berkeley db3/4 library */
+/* define if you have a berkeley db3/4/5 library */
/* #undef HAVE_DB3 */
/* Define to 1 if you have the <db3/db.h> header file. */
@@ -171,6 +211,12 @@
/* Define to 1 if you have the <db4/db.h> header file. */
/* #undef HAVE_DB4_DB_H */
+/* Define to 1 if you have the <db5/db.h> header file. */
+/* #undef HAVE_DB5_DB_H */
+
+/* Define if you have user supplied header location */
+/* #undef HAVE_DBHEADER */
+
/* Define to 1 if you have the `dbm_firstkey' function. */
#define HAVE_DBM_FIRSTKEY 1
@@ -180,9 +226,6 @@
/* Define to 1 if you have the `dbopen' function. */
#define HAVE_DBOPEN 1
-/* Define to 1 if you have the <db_185.h> header file. */
-/* #undef HAVE_DB_185_H */
-
/* Define to 1 if you have the `db_create' function. */
/* #undef HAVE_DB_CREATE */
@@ -243,6 +286,18 @@
/* Define to 1 if you have the <dirent.h> header file. */
#define HAVE_DIRENT_H 1
+/* have a dirfd function/macro */
+#define HAVE_DIRFD 1
+
+/* Define if DIR has field dd_fd. */
+#define HAVE_DIR_DD_FD 1
+
+/* Define to 1 if you have the `dispatch_async_f' function. */
+/* #undef HAVE_DISPATCH_ASYNC_F */
+
+/* Define to 1 if you have the <dispatch/dispatch.h> header file. */
+/* #undef HAVE_DISPATCH_DISPATCH_H */
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
@@ -249,6 +304,12 @@
/* Define to 1 if you have the `dlopen' function. */
#define HAVE_DLOPEN 1
+/* Define to 1 if you have the <dns.h> header file. */
+/* #undef HAVE_DNS_H */
+
+/* Define to 1 if you have the `dns_search' function. */
+/* #undef HAVE_DNS_SEARCH */
+
/* Define to 1 if you have the `dn_expand' function. */
#define HAVE_DN_EXPAND 1
@@ -258,9 +319,6 @@
/* Define if you have the function `ecalloc'. */
/* #undef HAVE_ECALLOC */
-/* Define to 1 if you have the `el_init' function. */
-#define HAVE_EL_INIT 1
-
/* Define if you have the function `emalloc'. */
/* #undef HAVE_EMALLOC */
@@ -282,6 +340,9 @@
/* Define if you have the function `estrdup'. */
/* #undef HAVE_ESTRDUP */
+/* Define to 1 if you have the <execinfo.h> header file. */
+/* #undef HAVE_EXECINFO_H */
+
/* Define if you have the function `fchown'. */
#define HAVE_FCHOWN 1
@@ -300,9 +361,6 @@
/* Define to 1 if you have the <fnmatch.h> header file. */
#define HAVE_FNMATCH_H 1
-/* Define if el_init takes four arguments. */
-#define HAVE_FOUR_VALUED_EL_INIT 1
-
/* Have -framework Security */
/* #undef HAVE_FRAMEWORK_SECURITY */
@@ -315,6 +373,9 @@
/* Define to 1 if you have the `gai_strerror' function. */
#define HAVE_GAI_STRERROR 1
+/* Define if os support gcd. */
+/* #undef HAVE_GCD */
+
/* Define to 1 if you have the <gdbm/ndbm.h> header file. */
/* #undef HAVE_GDBM_NDBM_H */
@@ -445,9 +506,6 @@
/* Define if you have the function `initgroups'. */
#define HAVE_INITGROUPS 1
-/* Define to 1 if you have the `initstate' function. */
-#define HAVE_INITSTATE 1
-
/* Define if you have the function `innetgr'. */
#define HAVE_INNETGR 1
@@ -490,14 +548,17 @@
/* Define to 1 if you have the `loadquery' function. */
/* #undef HAVE_LOADQUERY */
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
/* Define if you have the function `localtime_r'. */
#define HAVE_LOCALTIME_R 1
/* Define to 1 if you have the `logout' function. */
-#define HAVE_LOGOUT 1
+/* #undef HAVE_LOGOUT */
/* Define to 1 if you have the `logwtmp' function. */
-#define HAVE_LOGWTMP 1
+/* #undef HAVE_LOGWTMP */
/* Define to 1 if the system has the type `long long'. */
#define HAVE_LONG_LONG 1
@@ -559,12 +620,6 @@
/* Define to 1 if you have the <netinet/tcp.h> header file. */
#define HAVE_NETINET_TCP_H 1
-/* Define if you want to use Netinfo instead of krb5.conf. */
-/* #undef HAVE_NETINFO */
-
-/* Define to 1 if you have the <netinfo/ni.h> header file. */
-/* #undef HAVE_NETINFO_NI_H */
-
/* Define to 1 if you have the <net/if.h> header file. */
#define HAVE_NET_IF_H 1
@@ -622,6 +677,13 @@
/* Define if you have a readline compatible library. */
#define HAVE_READLINE 1
+/* Define to 1 if you have the
+ <[readline.h])[][]_AH_CHECK_HEADER([readline/readline.h]> header file. */
+/* #undef HAVE_READLINE_H */
+
+/* Define to 1 if you have the <readline/readline.h > header file. */
+/* #undef HAVE_READLINE_READLINE_H_ */
+
/* Define if you have the function `readv'. */
#define HAVE_READV 1
@@ -652,6 +714,12 @@
/* Define to 1 if the system has the type `sa_family_t'. */
#define HAVE_SA_FAMILY_T 1
+/* Define if you want support for cache in sqlite. */
+#undef HAVE_SCC
+
+/* Define to 1 if you have the <search.h> header file. */
+#define HAVE_SEARCH_H 1
+
/* Define to 1 if you have the <security/pam_modules.h> header file. */
#define HAVE_SECURITY_PAM_MODULES_H 1
@@ -709,9 +777,6 @@
/* Define to 1 if you have the `setsockopt' function. */
#define HAVE_SETSOCKOPT 1
-/* Define to 1 if you have the `setstate' function. */
-#define HAVE_SETSTATE 1
-
/* Define to 1 if you have the `setutent' function. */
/* #undef HAVE_SETUTENT */
@@ -719,7 +784,7 @@
/* #undef HAVE_SGI_GETCAPABILITYBYNAME */
/* Define to 1 if you have the <sgtty.h> header file. */
-#define HAVE_SGTTY_H 1
+/* #undef HAVE_SGTTY_H */
/* Define to 1 if you have the <shadow.h> header file. */
/* #undef HAVE_SHADOW_H */
@@ -742,6 +807,9 @@
/* Define to 1 if the system has the type `socklen_t'. */
#define HAVE_SOCKLEN_T 1
+/* Define if you want support for sqlite in Heimdal. */
+#define HAVE_SQLITE3 1
+
/* Define to 1 if the system has the type `ssize_t'. */
#define HAVE_SSIZE_T 1
@@ -763,6 +831,9 @@
/* Define if you have the function `strerror'. */
#define HAVE_STRERROR 1
+/* Define if you have the function strerror_r. */
+#define HAVE_STRERROR_R 1
+
/* Define if you have the function `strftime'. */
#define HAVE_STRFTIME 1
@@ -788,7 +859,7 @@
#define HAVE_STRNDUP 1
/* Define if you have the function `strnlen'. */
-/* #undef HAVE_STRNLEN */
+#define HAVE_STRNLEN 1
/* Define to 1 if you have the <stropts.h> header file. */
/* #undef HAVE_STROPTS_H */
@@ -808,6 +879,9 @@
/* Define to 1 if you have the `strsvis' function. */
/* #undef HAVE_STRSVIS */
+/* Define to 1 if you have the `strsvisx' function. */
+/* #undef HAVE_STRSVISX */
+
/* Define if you have the function `strtok_r'. */
#define HAVE_STRTOK_R 1
@@ -844,9 +918,30 @@
/* Define if struct utmpx has field ut_exit. */
/* #undef HAVE_STRUCT_UTMPX_UT_EXIT */
+/* Define if struct utmpx has field ut_host. */
+#define HAVE_STRUCT_UTMPX_UT_HOST 1
+
+/* Define if struct utmpx has field ut_id. */
+#define HAVE_STRUCT_UTMPX_UT_ID 1
+
+/* Define if struct utmpx has field ut_line. */
+#define HAVE_STRUCT_UTMPX_UT_LINE 1
+
+/* Define if struct utmpx has field ut_pid. */
+#define HAVE_STRUCT_UTMPX_UT_PID 1
+
/* Define if struct utmpx has field ut_syslen. */
/* #undef HAVE_STRUCT_UTMPX_UT_SYSLEN */
+/* Define if struct utmpx has field ut_tv. */
+#define HAVE_STRUCT_UTMPX_UT_TV 1
+
+/* Define if struct utmpx has field ut_type. */
+#define HAVE_STRUCT_UTMPX_UT_TYPE 1
+
+/* Define if struct utmpx has field ut_user. */
+#define HAVE_STRUCT_UTMPX_UT_USER 1
+
/* Define if struct utmp has field ut_addr. */
/* #undef HAVE_STRUCT_UTMP_UT_ADDR */
@@ -905,7 +1000,7 @@
/* #undef HAVE_SYS_BSWAP_H */
/* Define to 1 if you have the <sys/capability.h> header file. */
-/* #undef HAVE_SYS_CAPABILITY_H */
+#define HAVE_SYS_CAPABILITY_H 1
/* Define to 1 if you have the <sys/category.h> header file. */
/* #undef HAVE_SYS_CATEGORY_H */
@@ -1006,6 +1101,9 @@
/* Define to 1 if you have the <sys/wait.h> header file. */
#define HAVE_SYS_WAIT_H 1
+/* Define to 1 if you have the `tdelete' function. */
+#define HAVE_TDELETE 1
+
/* Define to 1 if you have the <termcap.h> header file. */
#define HAVE_TERMCAP_H 1
@@ -1018,6 +1116,9 @@
/* Define to 1 if you have the <term.h> header file. */
#define HAVE_TERM_H 1
+/* Define to 1 if you have the `tfind' function. */
+#define HAVE_TFIND 1
+
/* Define to 1 if you have the `tgetent' function. */
#define HAVE_TGETENT 1
@@ -1033,12 +1134,18 @@
/* Define to 1 if you have the <tmpdir.h> header file. */
/* #undef HAVE_TMPDIR_H */
+/* Define if you have the function `tsearch'. */
+#define HAVE_TSEARCH 1
+
/* Define to 1 if you have the `ttyname' function. */
#define HAVE_TTYNAME 1
/* Define to 1 if you have the `ttyslot' function. */
-#define HAVE_TTYSLOT 1
+/* #undef HAVE_TTYSLOT */
+/* Define to 1 if you have the `twalk' function. */
+#define HAVE_TWALK 1
+
/* Define to 1 if you have the <udb.h> header file. */
/* #undef HAVE_UDB_H */
@@ -1085,10 +1192,10 @@
/* #undef HAVE_UTIL_H */
/* Define to 1 if you have the <utmpx.h> header file. */
-/* #undef HAVE_UTMPX_H */
+#define HAVE_UTMPX_H 1
/* Define to 1 if you have the <utmp.h> header file. */
-#define HAVE_UTMP_H 1
+/* #undef HAVE_UTMP_H */
/* Define to 1 if the system has the type `u_int16_t'. */
#define HAVE_U_INT16_T 1
@@ -1141,9 +1248,15 @@
/* Define if you have the function `warnx'. */
#define HAVE_WARNX 1
+/* Define to 1 if you have the <winsock2.h> header file. */
+/* #undef HAVE_WINSOCK2_H */
+
/* Define if you have the function `writev'. */
#define HAVE_WRITEV 1
+/* Define to 1 if you have the <ws2tcpip.h> header file. */
+/* #undef HAVE_WS2TCPIP_H */
+
/* define if struct winsize has ws_xpixel */
#define HAVE_WS_XPIXEL 1
@@ -1177,24 +1290,44 @@
/* Define if you have the `__progname' variable. */
#define HAVE___PROGNAME 1
+/* have __sync_add_and_fetch */
+#if defined(__FreeBSD__) && (defined(__arm__) || defined(__mips__))
+#undef HAVE___SYNC_ADD_AND_FETCH /* Not supported on FreeBSD/arm */
+#else
+#define HAVE___SYNC_ADD_AND_FETCH 1
+#endif
+
+/* Define if you want support for weak crypto */
+#define HEIM_WEAK_CRYPTO 1
+
/* Define if you have the hesiod package. */
/* #undef HESIOD */
-/* Define if you are running IRIX 4. */
-/* #undef IRIX4 */
-
/* Enable Kerberos 5 support in applications. */
#define KRB5 1
+/* Define to enable kx509. */
+#define KX509 1
+
/* path to lib */
#define LIBDIR "/usr/lib"
+/* Define if you have the libedit package. */
+/* #undef LIBEDIT */
+
/* path to libexec */
#define LIBEXECDIR "/usr/libexec"
+/* Define if you have the libintl package. */
+/* #undef LIBINTL */
+
/* path to localstate */
#define LOCALSTATEDIR "/var/heimdal"
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#define LT_OBJDIR ".libs/"
+
/* define if the system is missing a prototype for asnprintf() */
#define NEED_ASNPRINTF_PROTO 1
@@ -1228,6 +1361,9 @@
/* define if the system is missing a prototype for mkstemp() */
/* #undef NEED_MKSTEMP_PROTO */
+/* if your qsort is not a stable sort */
+/* #undef NEED_QSORT */
+
/* define if the system is missing a prototype for SecKeyGetCSPHandle() */
/* #undef NEED_SECKEYGETCSPHANDLE_PROTO */
@@ -1238,11 +1374,14 @@
/* #undef NEED_SNPRINTF_PROTO */
/* define if the system is missing a prototype for strndup() */
-#define NEED_STRNDUP_PROTO 1
+/* #undef NEED_STRNDUP_PROTO */
/* define if the system is missing a prototype for strsep() */
/* #undef NEED_STRSEP_PROTO */
+/* define if the system is missing a prototype for strsvisx() */
+#define NEED_STRSVISX_PROTO 1
+
/* define if the system is missing a prototype for strsvis() */
#define NEED_STRSVIS_PROTO 1
@@ -1314,13 +1453,16 @@
#define PACKAGE_NAME "Heimdal"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Heimdal 1.1"
+#define PACKAGE_STRING "Heimdal 1.5.2"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "heimdal"
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1"
+#define PACKAGE_VERSION "1.5.2"
/* Define to enable PKINIT. */
#define PKINIT 1
@@ -1329,7 +1471,7 @@
/* #undef POSIX_GETLOGIN */
/* Define if getpwnam_r has POSIX flavour. */
-/* #undef POSIX_GETPWNAM_R */
+#define POSIX_GETPWNAM_R 1
/* Define if you have the readline package. */
/* #undef READLINE */
@@ -1343,6 +1485,9 @@
/* Define if you want to use samba socket wrappers. */
/* #undef SOCKET_WRAPPER_REPLACE */
+/* Define if you have the sqlite3 package. */
+/* #undef SQLITE3 */
+
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
@@ -1349,6 +1494,16 @@
/* Define if you have streams ptys. */
/* #undef STREAMSPTY */
+/* define if prototype of strerror_r is compatible with int strerror_r(int,
+ char *, size_t) */
+#define STRERROR_R_PROTO_COMPATIBLE 1
+
+/* Define if os support want to detach is daemonens. */
+#define SUPPORT_DETACH 1
+
+/* Enable use of inetd style startup. */
+#define SUPPORT_INETD 1
+
/* path to sysconf */
#define SYSCONFDIR "/etc"
@@ -1362,7 +1517,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "1.1"
+#define VERSION "1.5.2"
/* Define if signal handlers return void. */
#define VOID_RETSIGTYPE 1
@@ -1377,6 +1532,9 @@
`char[]'. */
#define YYTEXT_POINTER 1
+/* Required for functional/sane headers on AIX */
+/* #undef _ALL_SOURCE */
+
/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */
@@ -1386,6 +1544,9 @@
/* Define for large files, on AIX-style hosts. */
/* #undef _LARGE_FILES */
+/* Define to get POSIX getpwnam_r in some systems. */
+/* #undef _POSIX_PTHREAD_SEMANTICS */
+
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
@@ -1407,6 +1568,9 @@
/* Define to `int' if <sys/types.h> does not define. */
/* #undef pid_t */
+/* Path name delimiter */
+#define rk_PATH_DELIM '/'
+
/* Define this to what the type sig_atomic_t should be. */
/* #undef sig_atomic_t */
@@ -1416,6 +1580,18 @@
/* Define to `int' if <sys/types.h> doesn't define. */
/* #undef uid_t */
+#if _AIX
+/* XXX this is gross, but kills about a gazillion warnings */
+struct ether_addr;
+struct sockaddr;
+struct sockaddr_dl;
+struct sockaddr_in;
+#endif
+
+#ifdef __APPLE__
+#include <AvailabilityMacros.h>
+#endif
+
#ifdef ROKEN_RENAME
#include "roken_rename.h"
#endif
@@ -1431,7 +1607,7 @@
#endif
-#if ENDIANESS_IN_SYS_PARAM_H
+#ifdef ENDIANESS_IN_SYS_PARAM_H
# include <sys/types.h>
# include <sys/param.h>
# if BYTE_ORDER == BIG_ENDIAN
@@ -1440,27 +1616,8 @@
#endif
-#if _AIX
-#define _ALL_SOURCE
-/* XXX this is gross, but kills about a gazillion warnings */
-struct ether_addr;
-struct sockaddr;
-struct sockaddr_dl;
-struct sockaddr_in;
-#endif
-/* IRIX 4 braindamage */
-#if IRIX == 4 && !defined(__STDC__)
-#define __STDC__ 0
-#endif
-
-
-
-#if defined(ENCRYPTION) && !defined(AUTHENTICATION)
-#define AUTHENTICATION 1
-#endif
-
/* Set this to the default system lead string for telnetd
* can contain %-escapes: %s=sysname, %m=machine, %r=os-release
* %v=os-version, %t=tty, %h=hostname, %d=date and time
Modified: trunk/kerberos5/include/crypto-headers.h
===================================================================
--- trunk/kerberos5/include/crypto-headers.h 2015-07-25 19:18:22 UTC (rev 7145)
+++ trunk/kerberos5/include/crypto-headers.h 2015-07-25 19:18:30 UTC (rev 7146)
@@ -1,18 +1,27 @@
/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/kerberos5/include/crypto-headers.h 233294 2012-03-22 08:48:42Z stas $ */
#ifndef __crypto_headers_h__
#define __crypto_headers_h__
-#define OPENSSL_DES_LIBDES_COMPATIBILITY
+
#include <openssl/evp.h>
#include <openssl/des.h>
#include <openssl/rc4.h>
-#include <openssl/md2.h>
+#include <openssl/rc2.h>
#include <openssl/md4.h>
#include <openssl/md5.h>
#include <openssl/sha.h>
-#include <openssl/aes.h>
#include <openssl/ui.h>
#include <openssl/rand.h>
#include <openssl/engine.h>
#include <openssl/pkcs12.h>
+#include <openssl/pem.h>
#include <openssl/hmac.h>
+#include <openssl/ec.h>
+#include <openssl/ecdsa.h>
+#include <openssl/ecdh.h>
+#ifndef BN_is_negative
+#define BN_set_negative(bn, flag) ((bn)->neg=(flag)?1:0)
+#define BN_is_negative(bn) ((bn)->neg != 0)
+#endif
+
#endif /* __crypto_headers_h__ */
Deleted: trunk/kerberos5/include/heim_threads.h
===================================================================
--- trunk/kerberos5/include/heim_threads.h 2015-07-25 19:18:22 UTC (rev 7145)
+++ trunk/kerberos5/include/heim_threads.h 2015-07-25 19:18:30 UTC (rev 7146)
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2003 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the Institute nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id$ */
-
-/*
- * Provide wrapper macros for thread synchronization primitives so we
- * can use native thread functions for those operating system that
- * supports it.
- *
- * This is so libkrb5.so (or more importantly, libgssapi.so) can have
- * thread support while the program that that dlopen(3)s the library
- * don't need to be linked to libpthread.
- */
-
-#ifndef HEIM_THREADS_H
-#define HEIM_THREADS_H 1
-
-/* assume headers already included */
-
-#if defined(__NetBSD__) && __NetBSD_Version__ >= 106120000 && __NetBSD_Version__< 299001200 && defined(ENABLE_PTHREAD_SUPPORT)
-
-/*
- * NetBSD have a thread lib that we can use that part of libc that
- * works regardless if application are linked to pthreads or not.
- * NetBSD newer then 2.99.11 just use pthread.h, and the same thing
- * will happen.
- */
-#include <threadlib.h>
-
-#define HEIMDAL_MUTEX mutex_t
-#define HEIMDAL_MUTEX_INITIALIZER MUTEX_INITIALIZER
-#define HEIMDAL_MUTEX_init(m) mutex_init(m, NULL)
-#define HEIMDAL_MUTEX_lock(m) mutex_lock(m)
-#define HEIMDAL_MUTEX_unlock(m) mutex_unlock(m)
-#define HEIMDAL_MUTEX_destroy(m) mutex_destroy(m)
-
-#define HEIMDAL_RWLOCK rwlock_t
-#define HEIMDAL_RWLOCK_INITIALIZER RWLOCK_INITIALIZER
-#define HEIMDAL_RWLOCK_init(l) rwlock_init(l, NULL)
-#define HEIMDAL_RWLOCK_rdlock(l) rwlock_rdlock(l)
-#define HEIMDAL_RWLOCK_wrlock(l) rwlock_wrlock(l)
-#define HEIMDAL_RWLOCK_tryrdlock(l) rwlock_tryrdlock(l)
-#define HEIMDAL_RWLOCK_trywrlock(l) rwlock_trywrlock(l)
-#define HEIMDAL_RWLOCK_unlock(l) rwlock_unlock(l)
-#define HEIMDAL_RWLOCK_destroy(l) rwlock_destroy(l)
-
-#define HEIMDAL_thread_key thread_key_t
-#define HEIMDAL_key_create(k,d,r) do { r = thr_keycreate(k,d); } while(0)
-#define HEIMDAL_setspecific(k,s,r) do { r = thr_setspecific(k,s); } while(0)
-#define HEIMDAL_getspecific(k) thr_getspecific(k)
-#define HEIMDAL_key_delete(k) thr_keydelete(k)
-
-#elif defined(ENABLE_PTHREAD_SUPPORT) && (!defined(__NetBSD__) || __NetBSD_Version__ >= 299001200)
-
-#include <pthread.h>
-
-#define HEIMDAL_MUTEX pthread_mutex_t
-#define HEIMDAL_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
-#define HEIMDAL_MUTEX_init(m) pthread_mutex_init(m, NULL)
-#define HEIMDAL_MUTEX_lock(m) pthread_mutex_lock(m)
-#define HEIMDAL_MUTEX_unlock(m) pthread_mutex_unlock(m)
-#define HEIMDAL_MUTEX_destroy(m) pthread_mutex_destroy(m)
-
-#define HEIMDAL_RWLOCK rwlock_t
-#define HEIMDAL_RWLOCK_INITIALIZER RWLOCK_INITIALIZER
-#define HEIMDAL_RWLOCK_init(l) pthread_rwlock_init(l, NULL)
-#define HEIMDAL_RWLOCK_rdlock(l) pthread_rwlock_rdlock(l)
-#define HEIMDAL_RWLOCK_wrlock(l) pthread_rwlock_wrlock(l)
-#define HEIMDAL_RWLOCK_tryrdlock(l) pthread_rwlock_tryrdlock(l)
-#define HEIMDAL_RWLOCK_trywrlock(l) pthread_rwlock_trywrlock(l)
-#define HEIMDAL_RWLOCK_unlock(l) pthread_rwlock_unlock(l)
-#define HEIMDAL_RWLOCK_destroy(l) pthread_rwlock_destroy(l)
-
-#define HEIMDAL_thread_key pthread_key_t
-#define HEIMDAL_key_create(k,d,r) do { r = pthread_key_create(k,d); } while(0)
-#define HEIMDAL_setspecific(k,s,r) do { r = pthread_setspecific(k,s); } while(0)
-#define HEIMDAL_getspecific(k) pthread_getspecific(k)
-#define HEIMDAL_key_delete(k) pthread_key_delete(k)
-
-#elif defined(HEIMDAL_DEBUG_THREADS)
-
-/* no threads support, just do consistency checks */
-#include <stdlib.h>
-
-#define HEIMDAL_MUTEX int
-#define HEIMDAL_MUTEX_INITIALIZER 0
-#define HEIMDAL_MUTEX_init(m) do { (*(m)) = 0; } while(0)
-#define HEIMDAL_MUTEX_lock(m) do { if ((*(m))++ != 0) abort(); } while(0)
-#define HEIMDAL_MUTEX_unlock(m) do { if ((*(m))-- != 1) abort(); } while(0)
-#define HEIMDAL_MUTEX_destroy(m) do {if ((*(m)) != 0) abort(); } while(0)
-
-#define HEIMDAL_RWLOCK rwlock_t int
-#define HEIMDAL_RWLOCK_INITIALIZER 0
-#define HEIMDAL_RWLOCK_init(l) do { } while(0)
-#define HEIMDAL_RWLOCK_rdlock(l) do { } while(0)
-#define HEIMDAL_RWLOCK_wrlock(l) do { } while(0)
-#define HEIMDAL_RWLOCK_tryrdlock(l) do { } while(0)
-#define HEIMDAL_RWLOCK_trywrlock(l) do { } while(0)
-#define HEIMDAL_RWLOCK_unlock(l) do { } while(0)
-#define HEIMDAL_RWLOCK_destroy(l) do { } while(0)
-
-#define HEIMDAL_internal_thread_key 1
-
-#else /* no thread support, no debug case */
-
-#define HEIMDAL_MUTEX int
-#define HEIMDAL_MUTEX_INITIALIZER 0
-#define HEIMDAL_MUTEX_init(m) do { (void)(m); } while(0)
-#define HEIMDAL_MUTEX_lock(m) do { (void)(m); } while(0)
-#define HEIMDAL_MUTEX_unlock(m) do { (void)(m); } while(0)
-#define HEIMDAL_MUTEX_destroy(m) do { (void)(m); } while(0)
-
-#define HEIMDAL_RWLOCK rwlock_t int
-#define HEIMDAL_RWLOCK_INITIALIZER 0
-#define HEIMDAL_RWLOCK_init(l) do { } while(0)
-#define HEIMDAL_RWLOCK_rdlock(l) do { } while(0)
-#define HEIMDAL_RWLOCK_wrlock(l) do { } while(0)
-#define HEIMDAL_RWLOCK_tryrdlock(l) do { } while(0)
-#define HEIMDAL_RWLOCK_trywrlock(l) do { } while(0)
-#define HEIMDAL_RWLOCK_unlock(l) do { } while(0)
-#define HEIMDAL_RWLOCK_destroy(l) do { } while(0)
-
-#define HEIMDAL_internal_thread_key 1
-
-#endif /* no thread support */
-
-#ifdef HEIMDAL_internal_thread_key
-
-typedef struct heim_thread_key {
- void *value;
- void (*destructor)(void *);
-} heim_thread_key;
-
-#define HEIMDAL_thread_key heim_thread_key
-#define HEIMDAL_key_create(k,d,r) \
- do { (k)->value = NULL; (k)->destructor = (d); r = 0; } while(0)
-#define HEIMDAL_setspecific(k,s,r) do { (k).value = s ; r = 0; } while(0)
-#define HEIMDAL_getspecific(k) ((k).value)
-#define HEIMDAL_key_delete(k) do { (*(k).destructor)((k).value); } while(0)
-
-#undef HEIMDAL_internal_thread_key
-#endif /* HEIMDAL_internal_thread_key */
-
-#endif /* HEIM_THREADS_H */
Deleted: trunk/kerberos5/include/krb5-types.cross
===================================================================
--- trunk/kerberos5/include/krb5-types.cross 2015-07-25 19:18:22 UTC (rev 7145)
+++ trunk/kerberos5/include/krb5-types.cross 2015-07-25 19:18:30 UTC (rev 7146)
@@ -1,61 +0,0 @@
-/*
- * generic krb5-types.h for cross compiling, assume system is posix/sus
- */
-
-#ifndef __krb5_types_h__
-#define __krb5_types_h__
-
-#include <inttypes.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-typedef socklen_t krb5_socklen_t;
-#include <unistd.h>
-typedef ssize_t krb5_ssize_t;
-
-#if !defined(__has_extension)
-#define __has_extension(x) 0
-#endif
-
-#define KRB5TYPES_REQUIRE_GNUC(m,n,p) \
- (((__GNUC__ * 10000) + (__GNUC_MINOR__ * 100) + __GNUC_PATCHLEVEL__) >= \
- (((m) * 10000) + ((n) * 100) + (p)))
-
-
-#ifndef HEIMDAL_DEPRECATED
-#if __has_extension(deprecated) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
-#define HEIMDAL_DEPRECATED __attribute__((deprecated))
-#elif defined(_MSC_VER) && (_MSC_VER>1200)
-#define HEIMDAL_DEPRECATED __declspec(deprecated)
-#else
-#define HEIMDAL_DEPRECATED
-#endif
-#endif
-
-#ifndef HEIMDAL_PRINTF_ATTRIBUTE
-#if __has_extension(format) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
-#define HEIMDAL_PRINTF_ATTRIBUTE(x) __attribute__((format x))
-#else
-#define HEIMDAL_PRINTF_ATTRIBUTE(x)
-#endif
-#endif
-
-#ifndef HEIMDAL_NORETURN_ATTRIBUTE
-#if __has_extension(noreturn) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
-#define HEIMDAL_NORETURN_ATTRIBUTE __attribute__((noreturn))
-#else
-#define HEIMDAL_NORETURN_ATTRIBUTE
-#endif
-#endif
-
-#ifndef HEIMDAL_UNUSED_ATTRIBUTE
-#if __has_extension(unused) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
-#define HEIMDAL_UNUSED_ATTRIBUTE __attribute__((unused))
-#else
-#define HEIMDAL_UNUSED_ATTRIBUTE
-#endif
-#endif
-
-typedef int krb5_socket_t;
-
-#endif /* __krb5_types_h__ */
Modified: trunk/kerberos5/include/krb5-types.h
===================================================================
--- trunk/kerberos5/include/krb5-types.h 2015-07-25 19:18:22 UTC (rev 7145)
+++ trunk/kerberos5/include/krb5-types.h 2015-07-25 19:18:30 UTC (rev 7146)
@@ -1,8 +1,10 @@
-/* krb5-types.h -- this file was generated for i386-unknown-freebsd5.0 by
- $Id: krb5-types.h,v 1.2 2012-08-26 15:13:11 laffer1 Exp $ */
-
/* $MidnightBSD$ */
+/*
+ * generic krb5-types.h for cross compiling, assume system is posix/sus
+ */
+/* $FreeBSD: stable/10/kerberos5/include/krb5-types.h 233294 2012-03-22 08:48:42Z stas $ */
+
#ifndef __krb5_types_h__
#define __krb5_types_h__
@@ -14,4 +16,49 @@
#include <unistd.h>
typedef ssize_t krb5_ssize_t;
+#if !defined(__has_extension)
+#define __has_extension(x) 0
+#endif
+
+#define KRB5TYPES_REQUIRE_GNUC(m,n,p) \
+ (((__GNUC__ * 10000) + (__GNUC_MINOR__ * 100) + __GNUC_PATCHLEVEL__) >= \
+ (((m) * 10000) + ((n) * 100) + (p)))
+
+
+#ifndef HEIMDAL_DEPRECATED
+#if __has_extension(deprecated) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
+#define HEIMDAL_DEPRECATED __attribute__((deprecated))
+#elif defined(_MSC_VER) && (_MSC_VER>1200)
+#define HEIMDAL_DEPRECATED __declspec(deprecated)
+#else
+#define HEIMDAL_DEPRECATED
+#endif
+#endif
+
+#ifndef HEIMDAL_PRINTF_ATTRIBUTE
+#if __has_extension(format) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
+#define HEIMDAL_PRINTF_ATTRIBUTE(x) __attribute__((format x))
+#else
+#define HEIMDAL_PRINTF_ATTRIBUTE(x)
+#endif
+#endif
+
+#ifndef HEIMDAL_NORETURN_ATTRIBUTE
+#if __has_extension(noreturn) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
+#define HEIMDAL_NORETURN_ATTRIBUTE __attribute__((noreturn))
+#else
+#define HEIMDAL_NORETURN_ATTRIBUTE
+#endif
+#endif
+
+#ifndef HEIMDAL_UNUSED_ATTRIBUTE
+#if __has_extension(unused) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
+#define HEIMDAL_UNUSED_ATTRIBUTE __attribute__((unused))
+#else
+#define HEIMDAL_UNUSED_ATTRIBUTE
+#endif
+#endif
+
+typedef int krb5_socket_t;
+
#endif /* __krb5_types_h__ */
Modified: trunk/kerberos5/include/version.h
===================================================================
--- trunk/kerberos5/include/version.h 2015-07-25 19:18:22 UTC (rev 7145)
+++ trunk/kerberos5/include/version.h 2015-07-25 19:18:30 UTC (rev 7146)
@@ -1,3 +1,6 @@
/* $MidnightBSD$ */
-const char *heimdal_long_version = "@(#)$Version: Heimdal 1.1.0 (FreeBSD) $";
-const char *heimdal_version = "Heimdal 1.1.0";
+#ifndef VERSION_HIDDEN
+#define VERSION_HIDDEN
+#endif
+VERSION_HIDDEN const char *heimdal_long_version = "@(#)$Version: Heimdal 1.5.2 (MidnightBSD) $";
+VERSION_HIDDEN const char *heimdal_version = "Heimdal 1.5.2";
More information about the Midnightbsd-cvs
mailing list