mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-11 13:50:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync with HEAD

Browse Source
This commit is contained in:
Kurt Zeilenga 2004-01-10 19:27:07 +00:00
parent 4c6721577f
commit 3731eaf4ce
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/librewrite/rule.c
View File

@ -189,6 +189,7 @@ rewrite_rule_compile(
/* cleanup ... */
return REWRITE_ERR;
}
action->la_type = REWRITE_ACTION_STOP;
break;

46
servers/slapd/slapi/slapi_utils.c
View File

@ -49,6 +49,22 @@ struct slapi_condvar {
ldap_pvt_thread_mutex_t mutex;
};
#ifdef LDAP_SLAPI
static int checkBVString(const struct berval *bv)
{
int i;
for ( i = 0; i < bv->bv_len; i++ ) {
if ( bv->bv_val[i] == '\0' )
return 0;
}
if ( bv->bv_val[i] != '\0' )
return 0;
return 1;
}
#endif /* LDAP_SLAPI */
/*
* This function converts an array of pointers to berval objects to
* an array of berval objects.
@ -293,7 +309,12 @@ slapi_entry_attr_get_charptr( const Slapi_Entry *e, const char *type )
}
if ( attr->a_vals != NULL && attr->a_vals[0].bv_len != 0 ) {
return slapi_ch_strdup( attr->a_vals[0].bv_val );
const char *p;
p = slapi_value_get_string( &attr->a_vals[0] );
if ( p != NULL ) {
return slapi_ch_strdup( (char *)p );
}
}
return NULL;
@ -3012,31 +3033,16 @@ int slapi_value_set_int(Slapi_Value *value, int intVal)
const char *slapi_value_get_string(const Slapi_Value *value)
{
#ifdef LDAP_SLAPI
if ( value == NULL ) {
return NULL;
}
if ( value == NULL ) return NULL;
if ( value->bv_val == NULL ) return NULL;
if ( !checkBVString( value ) ) return NULL;
return value->bv_val;
#else
return NULL;
#endif
}
#ifdef LDAP_SLAPI
static int checkBVString(const struct berval *bv)
{
int i;
for ( i = 0; i < bv->bv_len; i++ ) {
if ( bv->bv_val[i] == '\0' )
return 0;
}
if ( bv->bv_val[i] != '\0' )
return 0;
return 1;
}
#endif /* LDAP_SLAPI */
int slapi_value_get_int(const Slapi_Value *value)
{
#ifdef LDAP_SLAPI