/* bind.c - ldbm backend bind and unbind routines */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include <lutil.h>
int passwd_extop(
- Connection *conn, Operation *op,
- const char *reqoid,
- struct berval *reqdata,
- char **rspoid,
- struct berval **rspdata,
- LDAPControl ***rspctrls,
- const char **text,
- BerVarray *refs )
+ Operation *op,
+ SlapReply *rs )
{
- Backend *be;
- int rc;
-
- assert( reqoid != NULL );
- assert( strcmp( LDAP_EXOP_MODIFY_PASSWD, reqoid ) == 0 );
+ assert( ber_bvcmp( &slap_EXOP_MODIFY_PASSWD, &op->ore_reqoid ) == 0 );
if( op->o_dn.bv_len == 0 ) {
- *text = "only authenticated users may change passwords";
+ rs->sr_text = "only authenticated users may change passwords";
return LDAP_STRONG_AUTH_REQUIRED;
}
- ldap_pvt_thread_mutex_lock( &conn->c_mutex );
- be = conn->c_authz_backend;
- ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+ ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
+ op->o_bd = op->o_conn->c_authz_backend;
+ ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
- if( be == NULL ) {
- *text = "operation not supported for SASL user";
+ if( op->o_bd && !op->o_bd->be_extended ) {
+ rs->sr_text = "operation not supported for current user";
return LDAP_UNWILLING_TO_PERFORM;
}
- if( !be->be_extended ) {
- *text = "operation not supported for current user";
- return LDAP_UNWILLING_TO_PERFORM;
+ if (backend_check_restrictions( op, rs,
+ (struct berval *)&slap_EXOP_MODIFY_PASSWD ) != LDAP_SUCCESS) {
+ return rs->sr_err;
}
- {
- struct berval passwd = BER_BVC( LDAP_EXOP_MODIFY_PASSWD );
-
- rc = backend_check_restrictions( be, conn, op, &passwd, text );
- }
-
- if( rc != LDAP_SUCCESS ) {
- return rc;
- }
+ if( op->o_bd == NULL ) {
+#ifdef HAVE_CYRUS_SASL
+ rs->sr_err = slap_sasl_setpass( op, rs );
+#else
+ rs->sr_text = "no authz backend";
+ rs->sr_err = LDAP_OTHER;
+#endif
- if( be->be_update_ndn.bv_len ) {
+#if defined(LDAP_SYNCREPL) || !defined(SLAPD_MULTIMASTER)
+ /* This does not apply to multi-master case */
+ } else if( op->o_bd->be_update_ndn.bv_len ) {
/* we SHOULD return a referral in this case */
- *refs = referral_rewrite( be->be_update_refs,
- NULL, NULL, LDAP_SCOPE_DEFAULT );
- rc = LDAP_REFERRAL;
+ BerVarray defref = NULL;
+#ifdef LDAP_SYNCREPL
+ if ( op->o_bd->syncinfo ) {
+ defref = op->o_bd->syncinfo->master_bv;
+ } else
+#endif
+ {
+ defref = referral_rewrite( op->o_bd->be_update_refs,
+ NULL, NULL, LDAP_SCOPE_DEFAULT );
+ }
+ rs->sr_ref = defref;
+ rs->sr_err = LDAP_REFERRAL;
+#endif /* !SLAPD_MULTIMASTER */
} else {
- rc = be->be_extended(
- be, conn, op,
- reqoid, reqdata,
- rspoid, rspdata, rspctrls,
- text, refs );
+ rs->sr_err = op->o_bd->be_extended( op, rs );
}
- return rc;
+ return rs->sr_err;
}
int slap_passwd_parse( struct berval *reqdata,
int rc = LDAP_SUCCESS;
ber_tag_t tag;
ber_len_t len;
- char berbuf[256];
+ char berbuf[LBER_ELEMENT_SIZEOF];
BerElement *ber = (BerElement *)berbuf;
if( reqdata == NULL ) {
if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_ID ) {
if( id == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "slap_passwd_parse: ID not allowed.\n"));
+ LDAP_LOG( OPERATION, ERR,
+ "slap_passwd_parse: ID not allowed.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID not allowed.\n",
0, 0, 0 );
if( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "slap_passwd_parse: ID parse failed.\n"));
+ LDAP_LOG( OPERATION, ERR,
+ "slap_passwd_parse: ID parse failed.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID parse failed.\n",
0, 0, 0 );
if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_OLD ) {
if( oldpass == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "slap_passwd_parse: OLD not allowed.\n" ));
+ LDAP_LOG( OPERATION, ERR,
+ "slap_passwd_parse: OLD not allowed.\n" , 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD not allowed.\n",
0, 0, 0 );
if( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "slap_passwd_parse: ID parse failed.\n" ));
+ LDAP_LOG( OPERATION, ERR,
+ "slap_passwd_parse: ID parse failed.\n" , 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID parse failed.\n",
0, 0, 0 );
if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_NEW ) {
if( newpass == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "slap_passwd_parse: NEW not allowed.\n" ));
+ LDAP_LOG( OPERATION, ERR,
+ "slap_passwd_parse: NEW not allowed.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: NEW not allowed.\n",
0, 0, 0 );
if( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "slap_passwd_parse: OLD parse failed.\n"));
+ LDAP_LOG( OPERATION, ERR,
+ "slap_passwd_parse: OLD parse failed.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD parse failed.\n",
0, 0, 0 );
if( len != 0 ) {
decoding_error:
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "slap_passwd_parse: decoding error, len=%ld\n", (long)len ));
+ LDAP_LOG( OPERATION, ERR,
+ "slap_passwd_parse: decoding error, len=%ld\n", (long)len, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"slap_passwd_parse: decoding error, len=%ld\n",
{
int rc;
struct berval *bv = NULL;
- char berbuf[256];
+ char berbuf[LBER_ELEMENT_SIZEOF];
/* opaque structure, size unknown but smaller than berbuf */
BerElement *ber = (BerElement *)berbuf;
assert( cred != NULL );
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
- "slap_passwd_return: %ld\n",(long)cred->bv_len ));
+ LDAP_LOG( OPERATION, ENTRY,
+ "slap_passwd_return: %ld\n",(long)cred->bv_len, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_return: %ld\n",
(long) cred->bv_len, 0, 0 );
slap_passwd_check(
Connection *conn,
Attribute *a,
- struct berval *cred )
+ struct berval *cred,
+ const char **text )
{
int result = 1;
struct berval *bv;
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
ldap_pvt_thread_mutex_lock( &passwd_mutex );
#ifdef SLAPD_SPASSWD
- lutil_passwd_sasl_conn = conn->c_sasl_context;
+ lutil_passwd_sasl_conn = conn->c_sasl_authctx;
#endif
#endif
for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
- if( !lutil_passwd( bv, cred, NULL ) ) {
+ if( !lutil_passwd( bv, cred, NULL, text ) ) {
result = 0;
break;
}
{
struct berval *tmp;
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
- "slap_passwd_generate: begin\n" ));
+ LDAP_LOG( OPERATION, ENTRY, "slap_passwd_generate: begin\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_generate\n", 0, 0, 0 );
#endif
void
slap_passwd_hash(
struct berval * cred,
- struct berval * new )
+ struct berval * new,
+ const char **text )
{
struct berval *tmp;
#ifdef LUTIL_SHA1_BYTES
ldap_pvt_thread_mutex_lock( &passwd_mutex );
#endif
- tmp = lutil_passwd_hash( cred , hash );
+ tmp = lutil_passwd_hash( cred , hash, text );
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
ldap_pvt_thread_mutex_unlock( &passwd_mutex );