ports/net/openldap22-server/files/patch-servers::slapd::slap.h
Oliver Eikemeier df15f5fedf ** NOTICE: **
* OpenLDAP 2.0 is no longer actively maintained by the OpenLDAP Project.
* You are strongly encouraged to update to OpenLDAP 2.1
* Port maintainers: Please respect the default in bsd.port.mk
* I plan to remove OpenLDAP 2.0 from the FreeBSD ports tree May 2004

- Update net/openldap21-client and net/openldap21-server to version 2.1.23
- Update net/openldap22-client and net/openldap22-server to version 2.2.2.b,
  fix ITS#2747 from CVS
- some fixes for net/openldap20-server from CVS, seems like there won't be
  a 2.0.28 release anymore
- remove conflict with deleted port net/openldap12
- use PORTDOCS
- use USE_OPENSSL
- don't use _REENTRANT
- add a deinstall message

PR:		58278
Submitted by:	me
Approved by:	marcus (mentor)
2003-11-14 03:57:13 +00:00

40 lines
1.2 KiB
C

--- servers/slapd/slap.h Mon Oct 6 16:57:29 2003
+++ servers/slapd/slap.h Sun Oct 19 15:33:56 2003
@@ -451,11 +451,18 @@
*/
#define SLAP_MR_VALUE_OF_ASSERTION_SYNTAX 0x0001U
#define SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX 0x0002U
+#define SLAP_MR_VALUE_OF_SYNTAX 0x0003U
#define SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX( usage ) \
((usage) & SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX )
#define SLAP_MR_IS_VALUE_OF_ASSERTION_SYNTAX( usage ) \
((usage) & SLAP_MR_VALUE_OF_ASSERTION_SYNTAX )
+#ifdef LDAP_DEBUG
+#define SLAP_MR_IS_VALUE_OF_SYNTAX( usage ) \
+ ((usage) & SLAP_MR_VALUE_OF_SYNTAX)
+#else
+#define SLAP_MR_IS_VALUE_OF_SYNTAX( usage ) (1)
+#endif
/* either or both the asserted value or attribute value
* may be provided in normalized form
@@ -1311,8 +1318,8 @@
char *srvtab;
int schemachecking;
Filter *filter;
- char *filterstr;
- char *base;
+ struct berval filterstr;
+ struct berval base;
int scope;
int attrsonly;
char **attrs;
@@ -1980,7 +1987,6 @@
ValuesReturnFilter *o_vrFilter; /* ValuesReturnFilter */
- syncinfo_t* o_si;
int o_nocaching;
#ifdef LDAP_SLAPI