Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Nadezhda Ivanova
OpenLDAP
Commits
6eab68a8
Commit
6eab68a8
authored
May 15, 2003
by
Kurt Zeilenga
Browse files
regex thread safety fix from head
parent
d587111c
Changes
1
Hide whitespace changes
Inline
Side-by-side
servers/slapd/saslauthz.c
View file @
6eab68a8
...
...
@@ -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
;
...
...
@@ -281,6 +280,7 @@ static int slap_sasl_regexp( struct berval *in, struct berval *out )
{
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
)
);
...
...
@@ -300,7 +300,7 @@ static int slap_sasl_regexp( struct berval *in, struct berval *out )
/* Match the normalized SASL name to the saslregexp patterns */
for
(
reg
=
SaslRegexp
,
i
=
0
;
i
<
nSaslRegexp
;
i
++
,
reg
++
)
{
if
(
regexec
(
&
reg
->
sr_workspace
,
saslname
,
SASLREGEX_REPLACE
,
reg
->
sr_strings
,
0
)
==
0
)
sr_strings
,
0
)
==
0
)
break
;
}
...
...
@@ -312,7 +312,7 @@ static int slap_sasl_regexp( struct berval *in, struct berval *out )
* 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
);
sr_strings
,
saslname
,
out
);
#ifdef NEW_LOGGING
LDAP_LOG
(
TRANSPORT
,
ENTRY
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment