mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't pass NULL when string is expected.

Browse Source 
Other Cleanup
This commit is contained in:
Kurt Zeilenga 2003-09-15 21:22:20 +00:00
parent b299d7e067
commit 4679178db2
1 changed files with 52 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
servers/slapd/bind.c
View File

@ -59,25 +59,25 @@ do_bind(
* Force to connection to "anonymous" until bind succeeds. * Force to connection to "anonymous" until bind succeeds.
*/ */
ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex ); ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
if ( op->o_conn->c_sasl_bind_in_progress ) be = op->o_conn->c_authz_backend; if ( op->o_conn->c_sasl_bind_in_progress ) {
be = op->o_conn->c_authz_backend;
/* log authorization identity demotion */ }
if ( op->o_conn->c_dn.bv_len ) { if ( op->o_conn->c_dn.bv_len ) {
/* log authorization identity demotion */
Statslog( LDAP_DEBUG_STATS, Statslog( LDAP_DEBUG_STATS,
"conn=%lu op=%lu BIND anonymous mech=implicit ssf=0\n", "conn=%lu op=%lu BIND anonymous mech=implicit ssf=0\n",
op->o_connid, op->o_opid, 0, 0, 0 ); op->o_connid, op->o_opid, 0, 0, 0 );
} }
connection2anonymous( op->o_conn ); connection2anonymous( op->o_conn );
if ( op->o_conn->c_sasl_bind_in_progress ) op->o_conn->c_authz_backend = be; if ( op->o_conn->c_sasl_bind_in_progress ) {
op->o_conn->c_authz_backend = be;
}
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
if ( op->o_dn.bv_val != NULL ) { if ( op->o_dn.bv_val != NULL ) {
free( op->o_dn.bv_val ); free( op->o_dn.bv_val );
op->o_dn.bv_val = ch_strdup( "" ); op->o_dn.bv_val = ch_strdup( "" );
op->o_dn.bv_len = 0; op->o_dn.bv_len = 0;
} }
if ( op->o_ndn.bv_val != NULL ) { if ( op->o_ndn.bv_val != NULL ) {
free( op->o_ndn.bv_val ); free( op->o_ndn.bv_val );
op->o_ndn.bv_val = ch_strdup( "" ); op->o_ndn.bv_val = ch_strdup( "" );
@ -145,8 +145,7 @@ do_bind(
} }
if ( tag == LBER_ERROR ) { if ( tag == LBER_ERROR ) {
send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
"decoding error" );
rs->sr_err = SLAPD_DISCONNECT; rs->sr_err = SLAPD_DISCONNECT;
goto cleanup; goto cleanup;
} }
@ -165,7 +164,8 @@ do_bind(
* However, we must dup with regular malloc when storing any * However, we must dup with regular malloc when storing any
* resulting DNs in the op or conn structures. * resulting DNs in the op or conn structures.
*/ */
rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx ); rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn,
op->o_tmpmemctx );
if ( rs->sr_err != LDAP_SUCCESS ) { if ( rs->sr_err != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO, LDAP_LOG( OPERATION, INFO,
@ -193,17 +193,19 @@ do_bind(
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( OPERATION, DETAIL1, LDAP_LOG( OPERATION, DETAIL1,
"do_bind: version=%ld dn=\"%s\" method=%ld\n", "do_bind: version=%ld dn=\"%s\" method=%ld\n",
(unsigned long) version, op->o_req_dn.bv_val, (unsigned long)method ); (unsigned long) version, op->o_req_dn.bv_val,
(unsigned long) method );
#else #else
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"do_bind: version=%ld dn=\"%s\" method=%ld\n", "do_bind: version=%ld dn=\"%s\" method=%ld\n",
(unsigned long) version, (unsigned long) version, op->o_req_dn.bv_val,
op->o_req_dn.bv_val, (unsigned long) method ); (unsigned long) method );
#endif #endif
} }
Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu BIND dn=\"%s\" method=%ld\n", Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu BIND dn=\"%s\" method=%ld\n",
op->o_connid, op->o_opid, op->o_req_dn.bv_val, (unsigned long) method, 0 ); op->o_connid, op->o_opid, op->o_req_dn.bv_val, (unsigned long) method,
0 );
if ( version < LDAP_VERSION_MIN || version > LDAP_VERSION_MAX ) { if ( version < LDAP_VERSION_MIN || version > LDAP_VERSION_MAX ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
@ -226,8 +228,8 @@ do_bind(
goto cleanup; goto cleanup;
} }
/* we set connection version regardless of whether bind succeeds /*
* or not. * we set connection version regardless of whether bind succeeds or not.
*/ */
ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex ); ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
op->o_conn->c_protocol = version; op->o_conn->c_protocol = version;
@ -404,7 +406,8 @@ do_bind(
{ {
/* DN is not empty, disallow */ /* DN is not empty, disallow */
rs->sr_err = LDAP_UNWILLING_TO_PERFORM; rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
rs->sr_text = "unauthenticated bind (DN with no password) disallowed"; rs->sr_text =
"unauthenticated bind (DN with no password) disallowed";
} else if ( global_disallows & SLAP_DISALLOW_BIND_ANON ) { } else if ( global_disallows & SLAP_DISALLOW_BIND_ANON ) {
/* disallow */ /* disallow */
@ -438,8 +441,8 @@ do_bind(
send_ldap_result( op, rs ); send_ldap_result( op, rs );
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO, LDAP_LOG( OPERATION, INFO,
"do_bind: conn %d v%d simple bind(%s) disallowed\n", "do_bind: conn %d v%d simple bind(%s) disallowed\n",
op->o_connid, version, op->o_req_ndn.bv_val ); op->o_connid, version, op->o_req_ndn.bv_val );
#else #else
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"do_bind: v%d simple bind(%s) disallowed\n", "do_bind: v%d simple bind(%s) disallowed\n",
@ -458,8 +461,8 @@ do_bind(
send_ldap_result( op, rs ); send_ldap_result( op, rs );
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( OPERATION, DETAIL1, LDAP_LOG( OPERATION, DETAIL1,
"do_bind: conn %d v%d Kerberos V4 bind\n", "do_bind: conn %d v%d Kerberos V4 bind\n",
op->o_connid, version , 0 ); op->o_connid, version , 0 );
#else #else
Debug( LDAP_DEBUG_TRACE, "do_bind: v%d Kerberos V4 bind\n", Debug( LDAP_DEBUG_TRACE, "do_bind: v%d Kerberos V4 bind\n",
version, 0, 0 ); version, 0, 0 );
@ -475,8 +478,8 @@ do_bind(
send_ldap_result( op, rs ); send_ldap_result( op, rs );
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO, LDAP_LOG( OPERATION, INFO,
"do_bind: conn %ld v%d unknown authentication method (%ld)\n", "do_bind: conn %ld v%d unknown authentication method (%ld)\n",
op->o_connid, version, method ); op->o_connid, version, method );
#else #else
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"do_bind: v%d unknown authentication method (%ld)\n", "do_bind: v%d unknown authentication method (%ld)\n",
@ -527,11 +530,13 @@ do_bind(
rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_BIND_FN, pb ); rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_BIND_FN, pb );
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO, "do_bind: Bind preoperation plugin returned %d\n", LDAP_LOG( OPERATION, INFO,
rs->sr_err, 0, 0); "do_bind: Bind preoperation plugin returned %d\n",
rs->sr_err, 0, 0);
#else #else
Debug(LDAP_DEBUG_TRACE, "do_bind: Bind preoperation plugin returned %d.\n", Debug(LDAP_DEBUG_TRACE,
rs->sr_err, 0, 0); "do_bind: Bind preoperation plugin returned %d.\n",
rs->sr_err, 0, 0);
#endif #endif
switch ( rs->sr_err ) { switch ( rs->sr_err ) {
@ -548,7 +553,9 @@ do_bind(
/* SLAPI_BIND_ANONYMOUS is undocumented XXX */ /* SLAPI_BIND_ANONYMOUS is undocumented XXX */
default: default:
/* Authoritative, plugin sent result */ /* Authoritative, plugin sent result */
if ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rs->sr_err) != 0 ) { if ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE,
(void *)&rs->sr_err) != 0 )
{
rs->sr_err = LDAP_OTHER; rs->sr_err = LDAP_OTHER;
} }
@ -557,9 +564,11 @@ do_bind(
if ( rs->sr_err == LDAP_SUCCESS ) { if ( rs->sr_err == LDAP_SUCCESS ) {
slapi_pblock_get( pb, SLAPI_CONN_DN, (void *)&op->orb_edn.bv_val ); slapi_pblock_get( pb, SLAPI_CONN_DN, (void *)&op->orb_edn.bv_val );
if ( op->orb_edn.bv_val != NULL ) if ( op->orb_edn.bv_val != NULL ) {
op->orb_edn.bv_len = strlen( op->orb_edn.bv_val ); op->orb_edn.bv_len = strlen( op->orb_edn.bv_val );
rs->sr_err = dnPrettyNormal( NULL, &op->orb_edn, &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx ); }
rs->sr_err = dnPrettyNormal( NULL, &op->orb_edn,
&op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx );
ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex ); ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
ber_dupbv(&op->o_conn->c_dn, &op->o_req_dn); ber_dupbv(&op->o_conn->c_dn, &op->o_req_dn);
ber_dupbv(&op->o_conn->c_ndn, &op->o_req_ndn); ber_dupbv(&op->o_conn->c_ndn, &op->o_req_ndn);
@ -571,13 +580,15 @@ do_bind(
op->o_req_ndn.bv_len = 0; op->o_req_ndn.bv_len = 0;
if ( op->o_conn->c_dn.bv_len != 0 ) { if ( op->o_conn->c_dn.bv_len != 0 ) {
ber_len_t max = sockbuf_max_incoming_auth; ber_len_t max = sockbuf_max_incoming_auth;
ber_sockbuf_ctrl( op->o_conn->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max ); ber_sockbuf_ctrl( op->o_conn->c_sb,
LBER_SB_OPT_SET_MAX_INCOMING, &max );
} }
/* log authorization identity */ /* log authorization identity */
Statslog( LDAP_DEBUG_STATS, Statslog( LDAP_DEBUG_STATS,
"conn=%lu op=%lu BIND dn=\"%s\" mech=simple (SLAPI) ssf=0\n", "conn=%lu op=%lu BIND dn=\"%s\" mech=simple (SLAPI) ssf=0\n",
op->o_connid, op->o_opid, op->o_connid, op->o_opid,
op->o_conn->c_dn.bv_val, 0, 0 ); op->o_conn->c_dn.bv_val ? op->o_conn->c_dn.bv_val : "<empty>",
0, 0 );
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex ); ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
} }
goto cleanup; goto cleanup;
@ -585,7 +596,7 @@ do_bind(
} }
#endif /* defined( LDAP_SLAPI ) */ #endif /* defined( LDAP_SLAPI ) */
if ( op->o_bd->be_bind ) { if( op->o_bd->be_bind ) {
op->orb_method = method; op->orb_method = method;
rs->sr_err = (op->o_bd->be_bind)( op, rs ); rs->sr_err = (op->o_bd->be_bind)( op, rs );
@ -597,7 +608,7 @@ do_bind(
} }
/* be_bind returns regular/global edn */ /* be_bind returns regular/global edn */
if(op->orb_edn.bv_len) { if( op->orb_edn.bv_len ) {
op->o_conn->c_dn = op->orb_edn; op->o_conn->c_dn = op->orb_edn;
} else { } else {
ber_dupbv(&op->o_conn->c_dn, &op->o_req_dn); ber_dupbv(&op->o_conn->c_dn, &op->o_req_dn);
@ -638,17 +649,19 @@ do_bind(
} else { } else {
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
"operation not supported within namingContext" ); "operation not supported within naming context" );
} }
#if defined( LDAP_SLAPI ) #if defined( LDAP_SLAPI )
if ( doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_BIND_FN, pb ) < 0 ) { if ( doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_BIND_FN, pb ) < 0 ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO, "do_bind: Bind postoperation plugins failed\n", LDAP_LOG( OPERATION, INFO,
0, 0, 0); "do_bind: Bind postoperation plugins failed\n",
0, 0, 0);
#else #else
Debug(LDAP_DEBUG_TRACE, "do_bind: Bind postoperation plugins failed.\n", Debug(LDAP_DEBUG_TRACE,
0, 0, 0); "do_bind: Bind postoperation plugins failed.\n",
0, 0, 0);
#endif #endif
} }
#endif /* defined( LDAP_SLAPI ) */ #endif /* defined( LDAP_SLAPI ) */