mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix dnParent to return '' if the dn is a rdn

Browse Source
This commit is contained in:
Pierangelo Masarati 2002-01-17 22:36:53 +00:00
parent 4624bbafba
commit 3894bd332b
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
servers/slapd/dn.c
View File

@ -556,6 +556,36 @@ dnMatch(
return( LDAP_SUCCESS ); return( LDAP_SUCCESS );
} }
/*
* dnParent - dn's parent, in-place
*
* note: the incoming dn is assumed to be normalized/prettyfied,
* so that escaped rdn/ava separators are in '\'+hexpair form
*/
int
dnParent(
const char *dn,
const char **pdn )
{
const char *p;
p = strchr( dn, ',' );
/* one-level dn */
if ( p == NULL ) {
*pdn = "";
return LDAP_SUCCESS;
}
assert( DN_SEPARATOR( p[ 0 ] ) );
p++;
assert( ATTR_LEADCHAR( p[ 0 ] ) );
*pdn = p;
return LDAP_SUCCESS;
}
#ifdef SLAP_DN_MIGRATION #ifdef SLAP_DN_MIGRATION
/* /*
* these routines are provided for migration purposes only! * these routines are provided for migration purposes only!
@ -602,34 +632,6 @@ dn_normalize( char *dn )
return dn; return dn;
} }
/*
* dnParent - dn's parent, in-place
*
* note: the incoming dn is assumed to be normalized/prettyfied,
* so that escaped rdn/ava separators are in '\'+hexpair form
*/
int
dnParent(
const char *dn,
const char **pdn )
{
const char *p;
p = strchr( dn, ',' );
if ( p == NULL ) {
return LDAP_INVALID_DN_SYNTAX;
}
assert( DN_SEPARATOR( p[ 0 ] ) );
p++;
assert( ! ASCII_SPACE( p[ 0 ] ) );
*pdn = p;
return LDAP_SUCCESS;
}
/* /*
* dn_parent - return the dn's parent, in-place * dn_parent - return the dn's parent, in-place
* FIXME: should be replaced by dnParent() * FIXME: should be replaced by dnParent()