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

ITS#3755 silence strict-aliasing warnings

Browse source
This commit is contained in:
Howard Chu 2006-11-10 10:39:54 +00:00
parent 8e48a3c317
commit b42d93f24f
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/tools/ldapsearch.c
View file

@ -920,7 +920,7 @@ getNextPage:
char *realbase = base; char *realbase = base;
if ( realbase == NULL ) { if ( realbase == NULL ) {
ldap_get_option( ld, LDAP_OPT_DEFBASE, (void **)&realbase ); ldap_get_option( ld, LDAP_OPT_DEFBASE, (void **)(char *)&realbase );
} }
printf( "#\n" ); printf( "#\n" );

8
libraries/libldap/cyrus.c
View file

@ -165,7 +165,7 @@ sb_sasl_setup( Sockbuf_IO_Desc *sbiod, void *arg )
return -1; return -1;
} }
sasl_getprop( p->sasl_context, SASL_MAXOUTBUF, sasl_getprop( p->sasl_context, SASL_MAXOUTBUF,
(SASL_CONST void **) &p->sasl_maxbuf ); (SASL_CONST void **)(char *) &p->sasl_maxbuf );
sbiod->sbiod_pvt = p; sbiod->sbiod_pvt = p;
@ -847,7 +847,7 @@ ldap_int_sasl_bind(
if( flags != LDAP_SASL_QUIET ) { if( flags != LDAP_SASL_QUIET ) {
saslrc = sasl_getprop( ctx, SASL_USERNAME, saslrc = sasl_getprop( ctx, SASL_USERNAME,
(SASL_CONST void **) &data ); (SASL_CONST void **)(char *) &data );
if( saslrc == SASL_OK && data && *data ) { if( saslrc == SASL_OK && data && *data ) {
fprintf( stderr, "SASL username: %s\n", data ); fprintf( stderr, "SASL username: %s\n", data );
} }
@ -861,7 +861,7 @@ ldap_int_sasl_bind(
#endif #endif
} }
saslrc = sasl_getprop( ctx, SASL_SSF, (SASL_CONST void **) &ssf ); saslrc = sasl_getprop( ctx, SASL_SSF, (SASL_CONST void **)(char *) &ssf );
if( saslrc == SASL_OK ) { if( saslrc == SASL_OK ) {
if( flags != LDAP_SASL_QUIET ) { if( flags != LDAP_SASL_QUIET ) {
fprintf( stderr, "SASL SSF: %lu\n", fprintf( stderr, "SASL SSF: %lu\n",
@ -1158,7 +1158,7 @@ ldap_int_sasl_get_option( LDAP *ld, int option, void *arg )
} }
sc = sasl_getprop( ctx, SASL_SSF, sc = sasl_getprop( ctx, SASL_SSF,
(SASL_CONST void **) &ssf ); (SASL_CONST void **)(char *) &ssf );
if ( sc != SASL_OK ) { if ( sc != SASL_OK ) {
return -1; return -1;

4
libraries/libldap/getdn.c
View file

@ -3370,7 +3370,7 @@ ldap_X509dn2bv( void *x509_name, struct berval *bv, LDAPDN_rewrite_func *func,
if ( newDN == NULL ) if ( newDN == NULL )
return LDAP_NO_MEMORY; return LDAP_NO_MEMORY;
} else { } else {
newDN = (LDAPDN)ptrs; newDN = (LDAPDN)(char *)ptrs;
} }
newDN[nrdns] = NULL; newDN[nrdns] = NULL;
@ -3502,7 +3502,7 @@ nomem:
if ( oidsize != 0 ) if ( oidsize != 0 )
LDAP_FREE( oidbuf ); LDAP_FREE( oidbuf );
if ( newDN != (LDAPDN) ptrs ) if ( newDN != (LDAPDN)(char *) ptrs )
LDAP_FREE( newDN ); LDAP_FREE( newDN );
return rc; return rc;
} }

2
servers/slapd/sasl.c
View file

@ -1534,7 +1534,7 @@ slap_sasl_setpass( Operation *op, SlapReply *rs )
assert( ber_bvcmp( &slap_EXOP_MODIFY_PASSWD, &op->ore_reqoid ) == 0 ); assert( ber_bvcmp( &slap_EXOP_MODIFY_PASSWD, &op->ore_reqoid ) == 0 );
rs->sr_err = sasl_getprop( op->o_conn->c_sasl_authctx, SASL_USERNAME, rs->sr_err = sasl_getprop( op->o_conn->c_sasl_authctx, SASL_USERNAME,
(SASL_CONST void **)&id.bv_val ); (SASL_CONST void **)(char *)&id.bv_val );
if( rs->sr_err != SASL_OK ) { if( rs->sr_err != SASL_OK ) {
rs->sr_text = "unable to retrieve SASL username"; rs->sr_text = "unable to retrieve SASL username";