upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-03 20:40:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid conflict with e_ndn macro

Browse source
This commit is contained in:
Howard Chu 2001-12-24 17:06:46 +00:00
parent fa30a46446
commit 6e3ec13e05
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
servers/slapd/back-ldap/attribute.c
View file

@ -17,7 +17,7 @@
/* return 0 IFF we can retrieve the attributes
* of entry with e_ndn
* of entry with ndn
*/
int
ldap_back_attribute(
@ -25,7 +25,7 @@ ldap_back_attribute(
Connection *conn,
Operation *op,
Entry *target,
const char *e_ndn,
const char *ndn,
AttributeDescription *entry_at,
struct berval ***vals
)
@ -40,7 +40,7 @@ ldap_back_attribute(
LDAP *ld;
*vals = NULL;
if (target != NULL && strcmp(target->e_ndn, e_ndn) == 0) {
if (target != NULL && strcmp(target->e_ndn, ndn) == 0) {
/* we already have a copy of the entry */
/* attribute and objectclass mapping has already been done */
if ((attr = attr_find(target->e_attrs, entry_at)) == NULL)
@ -73,7 +73,7 @@ ldap_back_attribute(
if (ldap_bind_s(ld, li->binddn, li->bindpw, LDAP_AUTH_SIMPLE) == LDAP_SUCCESS) {
gattr[0] = mapped;
gattr[1] = NULL;
if (ldap_search_ext_s(ld, e_ndn, LDAP_SCOPE_BASE, "(objectclass=*)",
if (ldap_search_ext_s(ld, ndn, LDAP_SCOPE_BASE, "(objectclass=*)",
gattr, 0, NULL, NULL, LDAP_NO_LIMIT,
LDAP_NO_LIMIT, &result) == LDAP_SUCCESS)
{

2
servers/slapd/back-ldap/external.h
View file

@ -72,7 +72,7 @@ extern int ldap_back_group LDAP_P(( BackendDB *bd,
extern int ldap_back_attribute LDAP_P(( BackendDB *bd,
Connection *conn, Operation *op,
Entry *target,
const char* e_ndn,
const char* ndn,
AttributeDescription* entry_at,
struct berval ***vals));