cleanup old TOOLID macro

[openldap] / include / ldap.h

diff --git a/include/ldap.h b/include/ldap.h
index 2de0acf8fc767052006774bf66cacd01086f8542..2a97528a37825ee7fc20e2c300c140b958d4e0e5 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -102,6 +102,8 @@ LDAP_BEGIN_DECL
 
 /* 0x34 - 0x0fff not defined by current draft */
 
+#define LDAP_OPT_PRIVATE_EXTENSION_BASE 0x4000  /* to 0x7FFF inclusive */
+
 /* private and experimental options */
 #define LDAP_OPT_DNS                           0x4001  /* use DN & DNS */
 
@@ -112,7 +114,7 @@ LDAP_BEGIN_DECL
 #define LDAP_OPT_NETWORK_TIMEOUT        0x5005  /* socket level timeout */
 #define LDAP_OPT_URI                           0x5006
 
-/* TLS options */
+/* OpenLDAP TLS options */
 #define LDAP_OPT_X_TLS_CACERTFILE      0x6001
 #define LDAP_OPT_X_TLS_CACERTDIR       0x6002
 #define LDAP_OPT_X_TLS_CERT            0x6003
@@ -129,6 +131,11 @@ LDAP_BEGIN_DECL
 #define LDAP_OPT_X_TLS_ALLOW           3
 #define LDAP_OPT_X_TLS_TRY             4
 
+/* OpenLDAP SASL options */
+#define LDAP_OPT_X_SASL_MINSSF         0x6100
+#define LDAP_OPT_X_SASL_MAXSSF         0x6101
+#define LDAP_OPT_X_SASL_ACTSSF         0x6102
+
 /* on/off values */
 #define LDAP_OPT_ON            ((void *) 1)
 #define LDAP_OPT_OFF   ((void *) 0)
@@ -557,9 +564,19 @@ ldap_controls_free LDAP_P((
  * in dnssrv.c:
  */
 LIBLDAP_F( int )
-ldap_dnssrv_init LDAP_P((
-       LDAP **ldp,
-       LDAP_CONST char *domain ));
+ldap_domain2dn LDAP_P((
+       LDAP_CONST char* domain,
+       char** dn ));
+
+LIBLDAP_F( int )
+ldap_dn2domain LDAP_P((
+       LDAP_CONST char* dn,
+       char** domain ));
+
+LIBLDAP_F( int )
+ldap_domain2hostlist LDAP_P((
+       LDAP_CONST char *domain,
+       char** hostlist ));
 
 /*
  * in extended.c: