mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-24 13:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

initialize struct timeval (fixes ITS#2014);

Browse Source 
also, check for return value of dnNormalize2: if the returned
DN contains undefined attributes, the normalization fails.
This commit is contained in:
Pierangelo Masarati 2002-08-10 14:13:46 +00:00
parent 1be4ab9d07
commit 328046248b
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
servers/slapd/back-meta/search.c
View File

@ -117,7 +117,7 @@ meta_back_search(
struct metainfo *li = ( struct metainfo * )be->be_private;
struct metaconn *lc;
struct metasingleconn *lsc;
struct timeval tv;
struct timeval tv = { 0, 0 };
LDAPMessage *res, *e;
int count, rc = 0, *msgid, sres = LDAP_NO_SUCH_OBJECT;
char *match = NULL, *err = NULL;
@ -467,11 +467,13 @@ meta_back_search(
#ifdef NEW_LOGGING
LDAP_LOG( BACK_META, ERR,
"meta_back_search [%d] match=\"%s\" err=\"%s\"\n",
"meta_back_search [%d] "
"match=\"%s\" err=\"%s\"\n",
i, match, err );
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ANY,
"=>meta_back_search [%d] match=\"%s\" err=\"%s\"\n",
"=>meta_back_search [%d] "
"match=\"%s\" err=\"%s\"\n",
i, match, err );
#endif /* !NEW_LOGGING */
@ -561,9 +563,9 @@ finish:;
}
if ( msgid ) {
free( msgid );
ch_free( msgid );
}
return rc;
}
@ -618,7 +620,16 @@ meta_send_entry(
return;
}
dnNormalize2( NULL, &ent.e_name, &ent.e_nname );
/*
* Note: this may fail if the target host(s) schema differs
* from the one known to the meta, and a DN with unknown
* attributes is returned.
*
* FIXME: should we log anything, or delegate to dnNormalize2?
*/
if ( dnNormalize2( NULL, &ent.e_name, &ent.e_nname ) != LDAP_SUCCESS ) {
return;
}
/*
* cache dn