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 problems caused by lint removal

Browse Source
This commit is contained in:
Kurt Zeilenga 2002-01-09 18:18:36 +00:00
parent 22f993f89b
commit 39c02506de
6 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
servers/slapd/back-bdb/modrdn.c
View File

@ -418,7 +418,7 @@ retry: /* transaction retry */
/* Get attribute type and attribute value of our new rdn, we will /* Get attribute type and attribute value of our new rdn, we will
* need to add that to our new entry * need to add that to our new entry
*/ */
if ( ldap_str2rdn( newrdn->bv_val, &new_rdn, &(char *)text, if ( ldap_str2rdn( newrdn->bv_val, &new_rdn, (char **)&text,
LDAP_DN_FORMAT_LDAP ) ) LDAP_DN_FORMAT_LDAP ) )
{ {
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
@ -433,7 +433,7 @@ retry: /* transaction retry */
"bdb_modrdn: new_rdn_type=\"%s\", new_rdn_val=\"%s\"\n", "bdb_modrdn: new_rdn_type=\"%s\", new_rdn_val=\"%s\"\n",
new_rdn[0][0]->la_attr.bv_val, new_rdn[0][0]->la_value.bv_val, 0 ); new_rdn[0][0]->la_attr.bv_val, new_rdn[0][0]->la_value.bv_val, 0 );
if ( ldap_str2rdn( dn->bv_val, &old_rdn, &(char *)text, if ( ldap_str2rdn( dn->bv_val, &old_rdn, (char **)&text,
LDAP_DN_FORMAT_LDAP ) ) LDAP_DN_FORMAT_LDAP ) )
{ {
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,

4
servers/slapd/back-ldbm/modrdn.c
View File

@ -496,7 +496,7 @@ ldbm_back_modrdn(
/* Get attribute types and values of our new rdn, we will /* Get attribute types and values of our new rdn, we will
* need to add that to our new entry * need to add that to our new entry
*/ */
if ( ldap_str2rdn( newrdn->bv_val, &new_rdn, &(char *)text, if ( ldap_str2rdn( newrdn->bv_val, &new_rdn, (char **)&text,
LDAP_DN_FORMAT_LDAP ) ) LDAP_DN_FORMAT_LDAP ) )
{ {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
@ -524,7 +524,7 @@ ldbm_back_modrdn(
#endif #endif
/* Retrieve the old rdn from the entry's dn */ /* Retrieve the old rdn from the entry's dn */
if ( ldap_str2rdn( dn->bv_val, &old_rdn, &(char *)text, if ( ldap_str2rdn( dn->bv_val, &old_rdn, (char **)&text,
LDAP_DN_FORMAT_LDAP ) ) LDAP_DN_FORMAT_LDAP ) )
{ {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING

2
servers/slapd/back-monitor/conn.c
View File

@ -404,7 +404,7 @@ monitor_subsys_conn_create(
/* create exactly the required entry */ /* create exactly the required entry */
if ( ldap_str2rdn( ndn->bv_val, &values, &(char *)text, if ( ldap_str2rdn( ndn->bv_val, &values, (char **)&text,
LDAP_DN_FORMAT_LDAP ) ) LDAP_DN_FORMAT_LDAP ) )
{ {
return( -1 ); return( -1 );

9
servers/slapd/back-passwd/search.c
View File

@ -90,8 +90,9 @@ passwd_back_search(
/* Use the first attribute of the DN /* Use the first attribute of the DN
* as an attribute within the entry itself. * as an attribute within the entry itself.
*/ */
if( ldap_str2rdn( base->bv_val, &rdn, &text, if( ldap_str2rdn( base->bv_val, &rdn, (char **)&text,
LDAP_DN_FORMAT_LDAP ) ) { LDAP_DN_FORMAT_LDAP ) )
{
err = LDAP_INVALID_DN_SYNTAX; err = LDAP_INVALID_DN_SYNTAX;
goto done; goto done;
} }
@ -194,7 +195,9 @@ passwd_back_search(
goto done; goto done;
} }
if ( ldap_str2rdn( base->bv_val, &rdn, &text, LDAP_DN_FORMAT_LDAP )) { if ( ldap_str2rdn( base->bv_val, &rdn, (char **)&text,
LDAP_DN_FORMAT_LDAP ))
{
err = LDAP_OPERATIONS_ERROR; err = LDAP_OPERATIONS_ERROR;
goto done; goto done;
} }

2
servers/slapd/controls.c
View File

@ -90,7 +90,7 @@ int get_ctrls(
LDAPControl ***ctrls = &op->o_ctrls; LDAPControl ***ctrls = &op->o_ctrls;
struct slap_control *c; struct slap_control *c;
int rc = LDAP_SUCCESS; int rc = LDAP_SUCCESS;
char *errmsg = NULL; const char *errmsg = NULL;
len = ber_pvt_ber_remaining(ber); len = ber_pvt_ber_remaining(ber);

11
servers/slapd/dn.c
View File

@ -646,7 +646,8 @@ dnParent(
const char *p; const char *p;
int rc; int rc;
rc = ldap_str2rdn( dn, NULL, & (char *) p, LDAP_DN_FORMAT_LDAP | LDAP_DN_SKIP ); rc = ldap_str2rdn( dn, NULL, (char **)&p,
LDAP_DN_FORMAT_LDAP | LDAP_DN_SKIP );
if ( rc != LDAP_SUCCESS ) { if ( rc != LDAP_SUCCESS ) {
return rc; return rc;
} }
@ -719,7 +720,7 @@ dnExtractRdn(
return LDAP_OTHER; return LDAP_OTHER;
} }
rc = ldap_str2rdn( dn->bv_val, &tmpRDN, &(char *)p, LDAP_DN_FORMAT_LDAP ); rc = ldap_str2rdn( dn->bv_val, &tmpRDN, (char **)&p, LDAP_DN_FORMAT_LDAP );
if ( rc != LDAP_SUCCESS ) { if ( rc != LDAP_SUCCESS ) {
return rc; return rc;
} }
@ -758,7 +759,7 @@ dn_rdnlen(
return 0; return 0;
} }
rc = ldap_str2rdn( dn_in->bv_val, NULL, &(char *)p, rc = ldap_str2rdn( dn_in->bv_val, NULL, (char **)&p,
LDAP_DN_FORMAT_LDAP | LDAP_DN_SKIP ); LDAP_DN_FORMAT_LDAP | LDAP_DN_SKIP );
if ( rc != LDAP_SUCCESS ) { if ( rc != LDAP_SUCCESS ) {
return 0; return 0;
@ -904,7 +905,7 @@ rdn_attrs( const char * rdn, char ***types, char ***values)
assert( *values == NULL ); assert( *values == NULL );
assert( types == NULL || *types == NULL ); assert( types == NULL || *types == NULL );
rc = ldap_str2rdn( rdn, &tmpRDN, &(char *)p, LDAP_DN_FORMAT_LDAP ); rc = ldap_str2rdn( rdn, &tmpRDN, (char **)&p, LDAP_DN_FORMAT_LDAP );
if ( rc != LDAP_SUCCESS ) { if ( rc != LDAP_SUCCESS ) {
return rc; return rc;
} }
@ -975,7 +976,7 @@ rdnValidate( struct berval *rdn )
/* /*
* must be parsable * must be parsable
*/ */
rc = ldap_str2rdn( rdn, &RDN, &p, LDAP_DN_FORMAT_LDAP ); rc = ldap_str2rdn( rdn, &RDN, (char **)&p, LDAP_DN_FORMAT_LDAP );
if ( rc != LDAP_SUCCESS ) { if ( rc != LDAP_SUCCESS ) {
return 0; return 0;
} }