Module Name: src
Committed By: lukem
Date: Mon Mar 8 05:07:40 UTC 2010
Modified Files:
src/external/bsd/openldap/include: lber_types.h ldap_config.h
ldap_features.h portable.h
Log Message:
Regenerate for openldap 2.4.21
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/openldap/include/lber_types.h \
src/external/bsd/openldap/include/ldap_config.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/include/ldap_features.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/include/portable.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openldap/include/lber_types.h
diff -u src/external/bsd/openldap/include/lber_types.h:1.1 src/external/bsd/openldap/include/lber_types.h:1.2
--- src/external/bsd/openldap/include/lber_types.h:1.1 Thu May 22 13:57:47 2008
+++ src/external/bsd/openldap/include/lber_types.h Mon Mar 8 05:07:40 2010
@@ -1,8 +1,8 @@
-/* include/lber_types.h. Generated by configure. */
-/* $OpenLDAP: pkg/ldap/include/lber_types.hin,v 1.3.2.3 2008/02/11 23:26:40 kurt Exp $ */
+/* include/lber_types.h. Generated from lber_types.hin by configure. */
+/* OpenLDAP: pkg/ldap/include/lber_types.hin,v 1.3.2.4 2009/01/22 00:00:51 kurt Exp */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/external/bsd/openldap/include/ldap_config.h
diff -u src/external/bsd/openldap/include/ldap_config.h:1.1 src/external/bsd/openldap/include/ldap_config.h:1.2
--- src/external/bsd/openldap/include/ldap_config.h:1.1 Thu May 22 13:57:47 2008
+++ src/external/bsd/openldap/include/ldap_config.h Mon Mar 8 05:07:40 2010
@@ -1,8 +1,8 @@
/* Generated from /usr/src/external/bsd/openldap/dist/include/ldap_config.hin */
-/* $OpenLDAP: pkg/ldap/include/ldap_config.hin,v 1.3.2.3 2008/02/11 23:26:40 kurt Exp $ */
+/* OpenLDAP: pkg/ldap/include/ldap_config.hin,v 1.3.2.4 2009/01/22 00:00:52 kurt Exp */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/external/bsd/openldap/include/ldap_features.h
diff -u src/external/bsd/openldap/include/ldap_features.h:1.2 src/external/bsd/openldap/include/ldap_features.h:1.3
--- src/external/bsd/openldap/include/ldap_features.h:1.2 Wed Aug 13 04:44:59 2008
+++ src/external/bsd/openldap/include/ldap_features.h Mon Mar 8 05:07:40 2010
@@ -1,8 +1,8 @@
-/* include/ldap_features.h. Generated by configure. */
-/* $OpenLDAP: pkg/ldap/include/ldap_features.hin,v 1.3.2.3 2008/02/11 23:26:40 kurt Exp $ */
+/* include/ldap_features.h. Generated from ldap_features.hin by configure. */
+/* OpenLDAP: pkg/ldap/include/ldap_features.hin,v 1.3.2.4 2009/01/22 00:00:52 kurt Exp */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
* <http://www.OpenLDAP.org/license.html>.
*/
-/*
+/*
* LDAP Features
*/
@@ -22,10 +22,10 @@
#define _LDAP_FEATURES_H 1
/* OpenLDAP API version macros */
-#define LDAP_VENDOR_VERSION 20411
+#define LDAP_VENDOR_VERSION 20421
#define LDAP_VENDOR_VERSION_MAJOR 2
#define LDAP_VENDOR_VERSION_MINOR 4
-#define LDAP_VENDOR_VERSION_PATCH 11
+#define LDAP_VENDOR_VERSION_PATCH 21
/*
** WORK IN PROGRESS!
Index: src/external/bsd/openldap/include/portable.h
diff -u src/external/bsd/openldap/include/portable.h:1.3 src/external/bsd/openldap/include/portable.h:1.4
--- src/external/bsd/openldap/include/portable.h:1.3 Sun Aug 31 10:29:51 2008
+++ src/external/bsd/openldap/include/portable.h Mon Mar 8 05:07:40 2010
@@ -1,11 +1,11 @@
-/* include/portable.h. Generated by configure. */
+/* include/portable.h. Generated from portable.hin by configure. */
/* include/portable.hin. Generated from configure.in by autoheader. */
/* begin of portable.h.pre */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2008 The OpenLDAP Foundation
+ * Copyright 1998-2009 The OpenLDAP Foundation
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,9 @@
/* end of portable.h.pre */
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
/* define to use both <string.h> and <strings.h> */
/* #undef BOTH_STRINGS_H */
@@ -170,8 +173,10 @@
/* Define to 1 if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1
+#if 0 /* NETBSD: API incompatible */
/* define if you actually have FreeBSD fetch(3) */
-/* #undef HAVE_FETCH */
+#define HAVE_FETCH 1
+#endif
/* Define to 1 if you have the <filio.h> header file. */
/* #undef HAVE_FILIO_H */
@@ -191,6 +196,9 @@
/* Define to 1 if you have the `getdtablesize' function. */
#define HAVE_GETDTABLESIZE 1
+/* Define to 1 if you have the `geteuid' function. */
+#define HAVE_GETEUID 1
+
/* Define to 1 if you have the `getgrgid' function. */
#define HAVE_GETGRGID 1
@@ -212,9 +220,6 @@
/* Define to 1 if you have the <getopt.h> header file. */
#define HAVE_GETOPT_H 1
-/* Define to 1 if you have the `getpass' function. */
-#define HAVE_GETPASS 1
-
/* Define to 1 if you have the `getpassphrase' function. */
/* #undef HAVE_GETPASSPHRASE */
@@ -351,7 +356,7 @@
#define HAVE_MEMORY_H 1
/* Define to 1 if you have the `memrchr' function. */
-/* #undef HAVE_MEMRCHR */
+#define HAVE_MEMRCHR 1
/* Define to 1 if you have the `mkstemp' function. */
#define HAVE_MKSTEMP 1
@@ -362,6 +367,9 @@
/* define this if you have mkversion */
#define HAVE_MKVERSION 1
+/* define if you have MozNSS */
+/* #undef HAVE_MOZNSS */
+
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
/* #undef HAVE_NDIR_H */
@@ -371,6 +379,9 @@
/* define if strerror_r returns char* instead of int */
/* #undef HAVE_NONPOSIX_STRERROR_R */
+/* Define to 1 if you have the <nssutil.h> header file. */
+/* #undef HAVE_NSSUTIL_H */
+
/* if you have NT Event Log */
/* #undef HAVE_NT_EVENT_LOG */
@@ -606,7 +617,7 @@
/* #undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTSLEN */
/* Define to 1 if `msg_control' is member of `struct msghdr'. */
-#define HAVE_STRUCT_MSGHDR_MSG_CONTROL 1
+/* #undef HAVE_STRUCT_MSGHDR_MSG_CONTROL */
/* Define to 1 if `pw_gecos' is member of `struct passwd'. */
#define HAVE_STRUCT_PASSWD_PW_GECOS 1
@@ -745,7 +756,7 @@
/* Define to 1 if you have the `thr_yield' function. */
/* #undef HAVE_THR_YIELD */
-#if 0 /* Define this in the Makefile */
+#if 0 /* NETBSD: We'll control via Makefile and ${MKCRYPTO} */
/* define if you have TLS */
#define HAVE_TLS 1
#endif
@@ -798,6 +809,9 @@
/* define if select implicitly yields */
#define HAVE_YIELDING_SELECT 1
+/* Define to 1 if you have the `_vsnprintf' function. */
+#define HAVE__VSNPRINTF 1
+
/* define to 32-bit or greater integer type */
#define LBER_INT_T int
@@ -838,7 +852,7 @@
#define LDAP_SYSLOG 1
/* Version */
-#define LDAP_VENDOR_VERSION 20411
+#define LDAP_VENDOR_VERSION 20421
/* Major */
#define LDAP_VENDOR_VERSION_MAJOR 2
@@ -847,7 +861,7 @@
#define LDAP_VENDOR_VERSION_MINOR 4
/* Patch */
-#define LDAP_VENDOR_VERSION_PATCH 11
+#define LDAP_VENDOR_VERSION_PATCH 21
/* define if memcmp is not 8-bit clean or is otherwise broken */
/* #undef NEED_MEMCMP_REPLACEMENT */
@@ -862,7 +876,7 @@
#define OPENLDAP_PACKAGE "OpenLDAP"
/* Version */
-#define OPENLDAP_VERSION "2.4.11"
+#define OPENLDAP_VERSION "2.4.21"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT ""
@@ -894,19 +908,19 @@
/* Define to the type of arg 5 for `select'. */
#define SELECT_TYPE_ARG5 (struct timeval *)
-/* The size of a `int', as computed by sizeof. */
+/* The size of `int', as computed by sizeof. */
#define SIZEOF_INT 4
-/* The size of a `long', as computed by sizeof. */
+/* The size of `long', as computed by sizeof. */
#define SIZEOF_LONG 4
-/* The size of a `long long', as computed by sizeof. */
+/* The size of `long long', as computed by sizeof. */
#define SIZEOF_LONG_LONG 8
-/* The size of a `short', as computed by sizeof. */
+/* The size of `short', as computed by sizeof. */
#define SIZEOF_SHORT 2
-/* The size of a `wchar_t', as computed by sizeof. */
+/* The size of `wchar_t', as computed by sizeof. */
#define SIZEOF_WCHAR_T 4
/* define to support per-object ACIs */
@@ -948,6 +962,9 @@
/* define to support cn=Monitor backend */
/* #undef SLAPD_MONITOR */
+/* define to support NDB backend */
+/* #undef SLAPD_NDB */
+
/* define to support NULL backend */
/* #undef SLAPD_NULL */
@@ -957,12 +974,18 @@
/* define for Audit Logging overlay */
/* #undef SLAPD_OVER_AUDITLOG */
+/* define for Collect overlay */
+/* #undef SLAPD_OVER_COLLECT */
+
/* define for Attribute Constraint overlay */
/* #undef SLAPD_OVER_CONSTRAINT */
/* define for Dynamic Directory Services overlay */
/* #undef SLAPD_OVER_DDS */
+/* define for Dynamic Directory Services overlay */
+/* #undef SLAPD_OVER_DEREF */
+
/* define for Dynamic Group overlay */
/* #undef SLAPD_OVER_DYNGROUP */
@@ -990,6 +1013,9 @@
/* define for Sequential Modify overlay */
/* #undef SLAPD_OVER_SEQMOD */
+/* define for ServerSideSort/VLV overlay */
+/* #undef SLAPD_OVER_SSSVLV */
+
/* define for Syncrepl Provider overlay */
/* #undef SLAPD_OVER_SYNCPROV */
@@ -1053,9 +1079,17 @@
/* define to use 'long long' for MP */
#define USE_MP_LONG_LONG 1
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* # undef WORDS_BIGENDIAN */
+# endif
+#endif
/* Define to the type of arg 3 for `accept'. */
#define ber_socklen_t socklen_t
@@ -1100,7 +1134,7 @@
/* #undef volatile */
/* define to snprintf routine */
-#define vsnprintf _vsnprintf
+/* #undef vsnprintf */
/* begin of portable.h.post */
@@ -1128,7 +1162,7 @@
# include <stddef.h>
#endif
-#ifdef HAVE_EBCDIC
+#ifdef HAVE_EBCDIC
/* ASCII/EBCDIC converting replacements for stdio funcs
* vsnprintf and snprintf are used too, but they are already
* checked by the configure script
