Quick merge: everything from HEAD

[openldap] / include / portable.hin

diff --git a/include/portable.hin b/include/portable.hin
index ba3be72eb18a975f4f8f23fe40cbf15eac8dbe81..b31e486f17c2a2dd83f59e693d5da530f13f87bf 100644 (file)
--- a/include/portable.hin
+++ b/include/portable.hin
@@ -4,7 +4,7 @@
 /* begin of portable.h.pre */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2006 The OpenLDAP Foundation
+ * Copyright 1998-2007 The OpenLDAP Foundation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -132,12 +132,6 @@
 /* Define to 1 if you have the <db.h> header file. */
 #undef HAVE_DB_H
 
-/* define if you have Kerberos des_debug */
-#undef HAVE_DES_DEBUG
-
-/* Define to 1 if you have the <des.h> header file. */
-#undef HAVE_DES_H
-
 /* define if your system supports /dev/poll */
 #undef HAVE_DEVPOLL
 
@@ -250,12 +244,6 @@
 /* Define to 1 if you have the <grp.h> header file. */
 #undef HAVE_GRP_H
 
-/* define if you have HEIMDAL Kerberos */
-#undef HAVE_HEIMDAL_KERBEROS
-
-/* Define to 1 if you have the <heim_err.h> header file. */
-#undef HAVE_HEIM_ERR_H
-
 /* Define to 1 if you have the `hstrerror' function. */
 #undef HAVE_HSTRERROR
 
@@ -283,36 +271,6 @@
 /* Define to 1 if you have the <io.h> header file. */
 #undef HAVE_IO_H
 
-/* define if you have Kerberos */
-#undef HAVE_KERBEROS
-
-/* Define to 1 if you have the <kerberosIV/des.h> header file. */
-#undef HAVE_KERBEROSIV_DES_H
-
-/* Define to 1 if you have the <kerberosIV/krb.h> header file. */
-#undef HAVE_KERBEROSIV_KRB_H
-
-/* define if you have Kerberos IV */
-#undef HAVE_KRB4
-
-/* define if you have Kerberos V with IV support */
-#undef HAVE_KRB425
-
-/* define if you have Kerberos V */
-#undef HAVE_KRB5
-
-/* Define to 1 if you have the <krb5.h> header file. */
-#undef HAVE_KRB5_H
-
-/* Define to 1 if you have the <krb-archaeology.h> header file. */
-#undef HAVE_KRB_ARCHAEOLOGY_H
-
-/* Define to 1 if you have the <krb.h> header file. */
-#undef HAVE_KRB_H
-
-/* define if you have Kth Kerberos */
-#undef HAVE_KTH_KERBEROS
-
 /* Define to 1 if you have the `gen' library (-lgen). */
 #undef HAVE_LIBGEN
 
@@ -463,7 +421,7 @@
 /* Define to 1 if you have the `pthread_kill_other_threads_np' function. */
 #undef HAVE_PTHREAD_KILL_OTHER_THREADS_NP
 
-/* Define to 1 if you have the `pthread_rwlock_destroy' function. */
+/* define if you have pthread_rwlock_destroy function */
 #undef HAVE_PTHREAD_RWLOCK_DESTROY
 
 /* Define to 1 if you have the `pthread_setconcurrency' function. */
@@ -819,9 +777,6 @@
 /* define to 1 if library is thread safe */
 #undef LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
 
-/* define to LDAP VENDOR VERSION */
-#undef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-
 /* define to LDAP VENDOR VERSION */
 #undef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
 
@@ -972,18 +927,12 @@
 /* define for Dynamic Directory Services overlay */
 #undef SLAPD_OVER_DDS
 
-/* define for Deny Operation overlay */
-#undef SLAPD_OVER_DENYOP
-
 /* define for Dynamic Group overlay */
 #undef SLAPD_OVER_DYNGROUP
 
 /* define for Dynamic List overlay */
 #undef SLAPD_OVER_DYNLIST
 
-/* define for Last Modification overlay */
-#undef SLAPD_OVER_LASTMOD
-
 /* define for Password Policy overlay */
 #undef SLAPD_OVER_PPOLICY