upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 07:39:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc cleanup

Browse source
This commit is contained in:
Jong Hyuk Choi 2003-12-01 17:56:36 +00:00
parent 59e129158c
commit 2bb75d5469
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
servers/slapd/add.c
View file

@ -588,7 +588,8 @@ int
slap_entry2mods( slap_entry2mods(
Entry *e, Entry *e,
Modifications **mods, Modifications **mods,
const char **text const char **text,
char *textbuf, size_t textlen )
) )
{ {
Modifications *modhead = NULL; Modifications *modhead = NULL;
@ -596,7 +597,9 @@ slap_entry2mods(
Modifications **modtail = &modhead; Modifications **modtail = &modhead;
Attribute *a_new; Attribute *a_new;
AttributeDescription *a_new_desc; AttributeDescription *a_new_desc;
int i, count, rc; int i, count;
*text = textbuf;
a_new = e->e_attrs; a_new = e->e_attrs;

4
servers/slapd/back-meta/cache-merge.c
View file

@ -112,6 +112,8 @@ merge_entry(
BerVarray value_array; BerVarray value_array;
Attribute *uuid_attr, *attr; Attribute *uuid_attr, *attr;
Entry *e; Entry *e;
char textbuf[SLAP_TEXT_BUFLEN];
size_t textlen = sizeof(textbuf);
SlapReply sreply = {REP_RESULT}; SlapReply sreply = {REP_RESULT};
@ -176,7 +178,7 @@ merge_entry(
if ( rc != LDAP_SUCCESS ) { if ( rc != LDAP_SUCCESS ) {
if ( rc == LDAP_ALREADY_EXISTS ) { if ( rc == LDAP_ALREADY_EXISTS ) {
slap_entry2mods( e, &modlist, &text ); slap_entry2mods( e, &modlist, &text, textbuf, textlen );
op_tmp.o_tag = LDAP_REQ_MODIFY; op_tmp.o_tag = LDAP_REQ_MODIFY;
op_tmp.orm_modlist = modlist; op_tmp.orm_modlist = modlist;
op_tmp.o_req_dn = e->e_name; op_tmp.o_req_dn = e->e_name;

3
servers/slapd/proto-slap.h
View file

@ -118,7 +118,8 @@ LDAP_SLAPD_F (int) slap_mods2entry LDAP_P(( Modifications *mods, Entry **e,
int repl_user, int dup, const char **text, char *textbuf, size_t textlen )); int repl_user, int dup, const char **text, char *textbuf, size_t textlen ));
LDAP_SLAPD_F (int) slap_entry2mods LDAP_P(( Entry *e, LDAP_SLAPD_F (int) slap_entry2mods LDAP_P(( Entry *e,
Modifications **mods, const char **text )); Modifications **mods, const char **text,
char *textbuf, size_t textlen ));
/* /*
* at.c * at.c

3
servers/slapd/tools/mimic.c
View file

@ -280,7 +280,8 @@ int root_dse_info( Connection *conn, Entry **entry, const char **text )
return -1; return -1;
} }
int slap_entry2mods( Entry *e, Modifications **mods, const char **text ) int slap_entry2mods( Entry *e, Modifications **mods, const char **text,
char *textbuf, size_t textlen )
{ {
return -1; return -1;
} }