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
a0e04557
Commit
a0e04557
authored
Dec 17, 2010
by
Quanah Gibson-Mount
Browse files
ITS#6616
parent
4fec1820
Changes
2
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
a0e04557
...
...
@@ -22,6 +22,7 @@ OpenLDAP 2.4.24 Engineering
Fixed slapd-meta anon retry with failed auth method (ITS#6643)
Fixed slapd-meta rebind proc (ITS#6665)
Fixed slapd-meta to correctly rebind as user (ITS#6574)
Fixed slapd-sql with null objectClass (ITS#6616)
Fixed slapo-pcache callback freeing (ITS#6640)
Fixed slapo-pcache to ignore undefined attrs (ITS#6600)
Fixed slapo-ppolicy don't update opattrs on consumers (ITS#6608)
...
...
servers/slapd/back-sql/entry-id.c
View file @
a0e04557
...
...
@@ -925,19 +925,26 @@ backsql_id2entry( backsql_srch_info *bsi, backsql_entryID *eid )
goto
done
;
}
ber_dupbv_x
(
&
bsi
->
bsi_e
->
e_name
,
&
eid
->
eid_dn
,
op
->
o_tmpmemctx
);
ber_dupbv_x
(
&
bsi
->
bsi_e
->
e_nname
,
&
eid
->
eid_ndn
,
op
->
o_tmpmemctx
);
bsi
->
bsi_e
->
e_attrs
=
NULL
;
bsi
->
bsi_e
->
e_private
=
NULL
;
if
(
eid
->
eid_oc
==
NULL
)
{
eid
->
eid_oc
=
backsql_id2oc
(
bsi
->
bsi_op
->
o_bd
->
be_private
,
eid
->
eid_oc_id
);
if
(
eid
->
eid_oc
==
NULL
)
{
Debug
(
LDAP_DEBUG_TRACE
,
"backsql_id2entry(): unable to fetch objectClass with id=%lu for entry id="
BACKSQL_IDFMT
" dn=
\"
%s
\"\n
"
,
eid
->
eid_oc_id
,
BACKSQL_IDARG
(
eid
->
eid_id
),
eid
->
eid_dn
.
bv_val
);
return
LDAP_OTHER
;
}
}
bsi
->
bsi_oc
=
eid
->
eid_oc
;
bsi
->
bsi_c_eid
=
eid
;
ber_dupbv_x
(
&
bsi
->
bsi_e
->
e_name
,
&
eid
->
eid_dn
,
op
->
o_tmpmemctx
);
ber_dupbv_x
(
&
bsi
->
bsi_e
->
e_nname
,
&
eid
->
eid_ndn
,
op
->
o_tmpmemctx
);
#ifndef BACKSQL_ARBITRARY_KEY
/* FIXME: unused */
bsi
->
bsi_e
->
e_id
=
eid
->
eid_id
;
...
...
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