Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joe Martin
OpenLDAP
Commits
bc7057c7
Commit
bc7057c7
authored
Feb 20, 2009
by
Quanah Gibson-Mount
Browse files
ITS#5960
parent
b28f5ab7
Changes
2
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
bc7057c7
...
...
@@ -8,6 +8,7 @@ OpenLDAP 2.4.15 Release (2009/02/19)
Fixed slapd-meta with entries with invalid attrs (ITS#5959)
Fixed slapo-pcache caching invalid entries (ITS#5927)
Fixed slapo-rwm objectClass preservation (ITS#5760)
Fixed slapo-rwm rwm_bva_rewrite handling (ITS#5960)
Build Environment
Fixed tester library linking for windows (ITS#5740)
...
...
servers/slapd/overlays/rwm.c
View file @
bc7057c7
...
...
@@ -2162,7 +2162,7 @@ rwm_cf_gen( ConfigArgs *c )
ConfigArgs
ca
=
{
0
};
int
i
,
last
;
for
(
last
=
0
;
!
BER_BVISNULL
(
&
rwmap
->
rwm_bva_rewrite
[
last
]
);
last
++
)
for
(
last
=
0
;
rwmap
->
rwm_bva_rewrite
&&
!
BER_BVISNULL
(
&
rwmap
->
rwm_bva_rewrite
[
last
]
);
last
++
)
/* count'em */
;
if
(
c
->
valx
>
last
)
{
...
...
@@ -2218,7 +2218,7 @@ rwm_cf_gen( ConfigArgs *c )
return
1
;
}
for
(
i
=
c
->
valx
;
!
BER_BVISNULL
(
&
rwmap
->
rwm_bva_rewrite
[
i
]
);
i
++
)
for
(
i
=
c
->
valx
;
rwmap
->
rwm_bva_rewrite
&&
!
BER_BVISNULL
(
&
rwmap
->
rwm_bva_rewrite
[
i
]
);
i
++
)
{
ca
.
line
=
rwmap
->
rwm_bva_rewrite
[
i
].
bv_val
;
ca
.
argc
=
0
;
...
...
@@ -2245,6 +2245,7 @@ rwm_cf_gen( ConfigArgs *c )
rwmap
->
rwm_bva_rewrite
=
ch_realloc
(
rwmap
->
rwm_bva_rewrite
,
(
last
+
2
)
*
sizeof
(
struct
berval
)
);
BER_BVZERO
(
&
rwmap
->
rwm_bva_rewrite
[
last
+
1
]
);
for
(
i
=
last
-
1
;
i
>=
c
->
valx
;
i
--
)
{
...
...
@@ -2369,7 +2370,8 @@ rwm_db_destroy(
if
(
rwmap
->
rwm_rw
)
{
rewrite_info_delete
(
&
rwmap
->
rwm_rw
);
ber_bvarray_free
(
rwmap
->
rwm_bva_rewrite
);
if
(
rwmap
->
rwm_bva_rewrite
)
ber_bvarray_free
(
rwmap
->
rwm_bva_rewrite
);
}
avl_free
(
rwmap
->
rwm_oc
.
remap
,
rwm_mapping_dst_free
);
...
...
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