From 2d7a2144dc4fa10cd9f55e697e28c02ed94cf36d Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Tue, 19 Jul 2005 15:35:00 +0000 Subject: [PATCH] result.c --- servers/slapd/ad.c | 12 +++++++----- servers/slapd/result.c | 2 +- servers/slapd/slap.h | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c index c690d2efdb..e931b4ea64 100644 --- a/servers/slapd/ad.c +++ b/servers/slapd/ad.c @@ -58,11 +58,13 @@ typedef struct Attr_option { int prefix; /* NAME is a tag and range prefix */ } Attr_option; -static Attr_option lang_option = { { sizeof("lang-")-1, "lang-" }, 1 }; - /* Options sorted by name, and number of options */ -static Attr_option *options = &lang_option; -static int option_count = 1; +static Attr_option internal_options[] = { + { { sizeof("lang-")-1, "lang-" }, 1 }, + { { sizeof("range=")-1, "range=" }, 1 } }; + +static Attr_option *options = internal_options; +static int option_count = 2; static Attr_option *ad_find_option_definition( const char *opt, int optlen ); @@ -1029,7 +1031,7 @@ ad_define_option( const char *name, const char *fname, int lineno ) int i; unsigned int optlen; - if ( options == &lang_option ) { + if ( options == internal_options ) { options = NULL; option_count = 0; } diff --git a/servers/slapd/result.c b/servers/slapd/result.c index 7a0a623607..8a624c9ec4 100644 --- a/servers/slapd/result.c +++ b/servers/slapd/result.c @@ -615,7 +615,7 @@ slap_send_ldap_result( Operation *op, SlapReply *rs ) } } -#ifdef notdef +#ifdef LDAP_SLAPI (void) call_pre_result_plugins( op, rs ); #endif /* LDAP_SLAPI */ diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index a3c11195d8..2c6c5e16bf 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -180,7 +180,7 @@ LDAP_BEGIN_DECL #define ATTR_CHAR(c) ( DESC_CHAR((c)) || OID_SEPARATOR(c) ) #define AD_LEADCHAR(c) ( ATTR_LEADCHAR(c) ) -#define AD_CHAR(c) ( ATTR_CHAR(c) || (c) == ';' ) +#define AD_CHAR(c) ( ATTR_CHAR(c) || (c) == ';' || (c) == '=' || (c) == '*' ) #define SLAP_NUMERIC(c) ( ASCII_DIGIT(c) || ASCII_SPACE(c) ) -- 2.39.5