Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joe Martin
OpenLDAP
Commits
fffebfe0
Commit
fffebfe0
authored
Jan 26, 2007
by
Howard Chu
Browse files
ITS#4817 fix from HEAD
parent
1ce41b7f
Changes
1
Hide whitespace changes
Inline
Side-by-side
servers/slapd/entry.c
View file @
fffebfe0
...
...
@@ -173,6 +173,8 @@ str2entry2( char *s, int checkvals )
goto
fail
;
}
#define bvcasematch(bv1, bv2) ( ((bv1)->bv_len == (bv2)->bv_len) && (strncasecmp((bv1)->bv_val, (bv2)->bv_val, (bv1)->bv_len) == 0) )
/* Make sure all attributes with multiple values are contiguous */
if
(
checkvals
)
{
int
j
,
k
;
...
...
@@ -181,7 +183,7 @@ str2entry2( char *s, int checkvals )
for
(
i
=
0
;
i
<
lines
;
i
++
)
{
for
(
j
=
i
+
1
;
j
<
lines
;
j
++
)
{
if
(
bvmatch
(
type
+
i
,
type
+
j
))
{
if
(
bv
case
match
(
type
+
i
,
type
+
j
))
{
/* out of order, move intervening attributes down */
if
(
j
!=
i
+
1
)
{
bv
=
vals
[
j
];
...
...
@@ -204,7 +206,7 @@ str2entry2( char *s, int checkvals )
for
(
i
=
0
;
i
<=
lines
;
i
++
)
{
ad_prev
=
ad
;
if
(
!
ad
||
(
i
<
lines
&&
!
bvmatch
(
type
+
i
,
&
ad
->
ad_cname
)))
{
if
(
!
ad
||
(
i
<
lines
&&
!
bv
case
match
(
type
+
i
,
&
ad
->
ad_cname
)))
{
ad
=
NULL
;
rc
=
slap_bv2ad
(
type
+
i
,
&
ad
,
&
text
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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