mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

result.c

Browse Source
This commit is contained in:
Luke Howard 2005-07-19 15:35:00 +00:00
parent d3ee8970d4
commit 2d7a2144dc
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
servers/slapd/ad.c
View File

@ -58,11 +58,13 @@ typedef struct Attr_option {
int prefix; /* NAME is a tag and range prefix */ int prefix; /* NAME is a tag and range prefix */
} Attr_option; } Attr_option;
static Attr_option lang_option = { { sizeof("lang-")-1, "lang-" }, 1 };
/* Options sorted by name, and number of options */ /* Options sorted by name, and number of options */
static Attr_option *options = &lang_option; static Attr_option internal_options[] = {
static int option_count = 1; { { 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 ); 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; int i;
unsigned int optlen; unsigned int optlen;
if ( options == &lang_option ) { if ( options == internal_options ) {
options = NULL; options = NULL;
option_count = 0; option_count = 0;
} }

2
servers/slapd/result.c
View File

@ -615,7 +615,7 @@ slap_send_ldap_result( Operation *op, SlapReply *rs )
} }
} }
#ifdef notdef #ifdef LDAP_SLAPI
(void) call_pre_result_plugins( op, rs ); (void) call_pre_result_plugins( op, rs );
#endif /* LDAP_SLAPI */ #endif /* LDAP_SLAPI */

2
servers/slapd/slap.h
View File

@ -180,7 +180,7 @@ LDAP_BEGIN_DECL
#define ATTR_CHAR(c) ( DESC_CHAR((c)) || OID_SEPARATOR(c) ) #define ATTR_CHAR(c) ( DESC_CHAR((c)) || OID_SEPARATOR(c) )
#define AD_LEADCHAR(c) ( ATTR_LEADCHAR(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) ) #define SLAP_NUMERIC(c) ( ASCII_DIGIT(c) || ASCII_SPACE(c) )