From b6ef8c1876cdf339821ec4b20e5fc34d711d660b Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 12 May 2003 23:57:19 +0000 Subject: [PATCH] ITS#2505 - make sr_strings per-op instead of static --- servers/slapd/saslauthz.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c index 0c8a59bf18..e8e8ac7087 100644 --- a/servers/slapd/saslauthz.c +++ b/servers/slapd/saslauthz.c @@ -33,7 +33,6 @@ typedef struct sasl_regexp { char *sr_match; /* regexp match pattern */ char *sr_replace; /* regexp replace pattern */ regex_t sr_workspace; /* workspace for regexp engine */ - regmatch_t sr_strings[SASLREGEX_REPLACE]; /* strings matching $1,$2 ... */ int sr_offset[SASLREGEX_REPLACE+2]; /* offsets of $1,$2... in *replace */ } SaslRegexp_t; @@ -282,6 +281,7 @@ static int slap_sasl_regexp( struct berval *in, struct berval *out, void *ctx ) { char *saslname = in->bv_val; SaslRegexp_t *reg; + regmatch_t sr_strings[SASLREGEX_REPLACE]; /* strings matching $1,$2 ... */ int i; memset( out, 0, sizeof( *out ) ); @@ -301,7 +301,7 @@ static int slap_sasl_regexp( struct berval *in, struct berval *out, void *ctx ) /* Match the normalized SASL name to the saslregexp patterns */ for( reg = SaslRegexp,i=0; isr_workspace, saslname, SASLREGEX_REPLACE, - reg->sr_strings, 0) == 0 ) + sr_strings, 0) == 0 ) break; } @@ -313,7 +313,7 @@ static int slap_sasl_regexp( struct berval *in, struct berval *out, void *ctx ) * to replace the $1,$2 with the strings that matched (b.*) and (d.*) */ slap_sasl_rx_exp( reg->sr_replace, reg->sr_offset, - reg->sr_strings, saslname, out, ctx ); + sr_strings, saslname, out, ctx ); #ifdef NEW_LOGGING LDAP_LOG( TRANSPORT, ENTRY,