X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fldap.h;h=239a402403c702ef396618194e736b9a2ce2ef15;hb=d60ef41cf47d4a1466947c2b8c8f93534ff73387;hp=907f8c4a1d3c41f178c2f507ff6f6e8afeb96207;hpb=247e3a875a98f90f8fd1636eb1fb492c5875bd68;p=openldap

diff --git a/include/ldap.h b/include/ldap.h
index 907f8c4a1d..239a402403 100644
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -205,6 +205,13 @@ typedef struct ldapcontrol {
 
 #define LDAP_EXOP_X_WHO_AM_I	"1.3.6.1.4.1.4203.1.11.3"
 
+/* LDAP Features */
+#define LDAP_FEATURE_ALL_OPERATIONAL_ATTRS "1.3.6.1.4.1.4203.1.5.1"  /* + */
+#define LDAP_FEATURE_OBJECTCLASS_ATTRS "1.3.6.1.4.1.4203.1.5.2"
+#define LDAP_FEATURE_ABSOLUTE_FILTERS "1.3.6.1.4.1.4203.1.5.3"  /* (&) (|) */
+#define LDAP_FEATURE_LANGUAGE_TAG_OPTIONS "1.3.6.1.4.1.4203.1.5.4"
+#define LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS "1.3.6.1.4.1.4203.1.5.5"
+
 /*
  * specific LDAP instantiations of BER types we know about
  */
@@ -447,42 +454,6 @@ typedef struct ldapmod {
 #define mod_bvalues	mod_vals.modv_bvals
 } LDAPMod;
 
-/*
- * structures for ldap getfilter routines
- */
-
-typedef struct ldap_filt_info {
-	char			*lfi_filter;
-	char			*lfi_desc;
-	int			lfi_scope;
-	int			lfi_isexact;
-	struct ldap_filt_info	*lfi_next;
-} LDAPFiltInfo;
-
-typedef struct ldap_filt_list {
-    char			*lfl_tag;
-    char			*lfl_pattern;
-    char			*lfl_delims;
-    LDAPFiltInfo		*lfl_ilist;
-    struct ldap_filt_list	*lfl_next;
-} LDAPFiltList;
-
-
-#define LDAP_FILT_MAXSIZ	1024
-
-typedef struct ldap_filt_desc {
-	LDAPFiltList		*lfd_filtlist;
-	LDAPFiltInfo		*lfd_curfip;
-	LDAPFiltInfo		lfd_retfi;
-	char			lfd_filter[ LDAP_FILT_MAXSIZ ];
-	char			*lfd_curval;
-	char			*lfd_curvalcopy;
-	char			**lfd_curvalwords;
-	char			*lfd_filtprefix;
-	char			*lfd_filtsuffix;
-} LDAPFiltDesc;
-
-
 /*
  * structure representing an ldap session which can
  * encompass connections to multiple servers (in the
@@ -1437,23 +1408,8 @@ ldap_unbind_ext_s LDAP_P((
 	LDAPControl		**clientctrls));
 
 /*
- * in getfilter.c
- *	(deprecated)
+ * in filter.c
  */
-LDAP_F( LDAPFiltDesc * )
-ldap_init_getfilter LDAP_P(( /* deprecated */
-	LDAP_CONST char *fname ));
-
-LDAP_F( LDAPFiltInfo * )
-ldap_getfirstfilter LDAP_P(( /* deprecated */
-	LDAPFiltDesc *lfdp,
-	/* LDAP_CONST */ char *tagpat,
-	/* LDAP_CONST */ char *value ));
-
-LDAP_F( LDAPFiltInfo * )
-ldap_getnextfilter LDAP_P(( /* deprecated */
-	LDAPFiltDesc *lfdp ));
-
 LDAP_F( int )
 ldap_put_vrFilter LDAP_P((
 	BerElement *ber,
@@ -1489,10 +1445,6 @@ LDAP_F( char * )
 ldap_strdup LDAP_P((
 	LDAP_CONST char * ));
 
-LDAP_F( void )
-ldap_getfilter_free LDAP_P((
-	LDAPFiltDesc *lfdp ));
-
 LDAP_F( void )
 ldap_mods_free LDAP_P((
 	LDAPMod **mods,