/* bind.c - ldbm backend bind and unbind routines */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
struct berval **rspdata,
LDAPControl ***rspctrls,
const char **text,
- struct berval ***refs )
+ BerVarray *refs )
{
int rc;
assert( reqoid != NULL );
- assert( strcmp( LDAP_EXOP_X_MODIFY_PASSWD, reqoid ) == 0 );
+ assert( strcmp( LDAP_EXOP_MODIFY_PASSWD, reqoid ) == 0 );
if( op->o_dn.bv_len == 0 ) {
*text = "only authenticated users may change passwords";
*text = "authorization database is read only";
rc = LDAP_UNWILLING_TO_PERFORM;
- } else if( conn->c_authz_backend->be_update_ndn != NULL ) {
+ } else if( conn->c_authz_backend->be_update_ndn.bv_len ) {
/* we SHOULD return a referral in this case */
*refs = referral_rewrite( conn->c_authz_backend->be_update_refs,
NULL, NULL, LDAP_SCOPE_DEFAULT );
}
int slap_passwd_parse( struct berval *reqdata,
- struct berval **id,
- struct berval **oldpass,
- struct berval **newpass,
+ struct berval *id,
+ struct berval *oldpass,
+ struct berval *newpass,
const char **text )
{
int rc = LDAP_SUCCESS;
tag = ber_peek_tag( ber, &len );
}
- if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_ID ) {
+ if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_ID ) {
if( id == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
goto done;
}
- tag = ber_scanf( ber, "O", id );
+ tag = ber_scanf( ber, "m", id );
if( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
tag = ber_peek_tag( ber, &len);
}
- if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_OLD ) {
+ if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_OLD ) {
if( oldpass == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
goto done;
}
- tag = ber_scanf( ber, "O", oldpass );
+ tag = ber_scanf( ber, "m", oldpass );
if( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
tag = ber_peek_tag( ber, &len);
}
- if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_NEW ) {
+ if( tag == LDAP_TAG_EXOP_MODIFY_PASSWD_NEW ) {
if( newpass == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
goto done;
}
- tag = ber_scanf( ber, "O", newpass );
+ tag = ber_scanf( ber, "m", newpass );
if( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
done:
if( rc != LDAP_SUCCESS ) {
- if( id != NULL ) {
- ber_bvfree( *id );
- *id = NULL;
+ if( id && id->bv_val != NULL ) {
+ free( id->bv_val );
+ id->bv_val = NULL;
}
- if( oldpass != NULL ) {
- ber_bvfree( *oldpass );
- *oldpass = NULL;
+ if( oldpass && oldpass->bv_val != NULL ) {
+ free( oldpass->bv_val );
+ oldpass->bv_val = NULL;
}
- if( newpass != NULL ) {
- ber_bvfree( *newpass );
- *newpass = NULL;
+ if( newpass && newpass->bv_val != NULL ) {
+ free( newpass->bv_val );
+ newpass->bv_val = NULL;
}
}
struct berval *cred )
{
int rc;
- struct berval *bv;
- BerElement *ber = ber_alloc_t(LBER_USE_DER);
+ struct berval *bv = NULL;
+ char berbuf[256];
+ /* opaque structure, size unknown but smaller than berbuf */
+ BerElement *ber = (BerElement *)berbuf;
assert( cred != NULL );
Debug( LDAP_DEBUG_TRACE, "slap_passwd_return: %ld\n",
(long) cred->bv_len, 0, 0 );
#endif
-
-
- if( ber == NULL ) return NULL;
+ ber_init_w_nullc( ber, LBER_USE_DER );
+
rc = ber_printf( ber, "{tON}",
- LDAP_TAG_EXOP_X_MODIFY_PASSWD_GEN, cred );
+ LDAP_TAG_EXOP_MODIFY_PASSWD_GEN, cred );
- if( rc == -1 ) {
- ber_free( ber, 1 );
- return NULL;
+ if( rc >= 0 ) {
+ (void) ber_flatten( ber, &bv );
}
- (void) ber_flatten( ber, &bv );
-
- ber_free( ber, 1 );
+ ber_free_buf( ber );
return bv;
}
Attribute *a,
struct berval *cred )
{
- int i;
int result = 1;
+ struct berval *bv;
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
ldap_pvt_thread_mutex_lock( &passwd_mutex );
#endif
#endif
- for ( i = 0; a->a_vals[i] != NULL; i++ ) {
- if( !lutil_passwd( a->a_vals[i], cred, NULL ) ) {
+ for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
+ if( !lutil_passwd( bv, cred, NULL ) ) {
result = 0;
break;
}
return result;
}
-struct berval * slap_passwd_generate( void )
+void
+slap_passwd_generate( struct berval *pass )
{
+ struct berval *tmp;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"slap_passwd_generate: begin\n" ));
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_generate\n", 0, 0, 0 );
#endif
-
-
/*
* generate passwords of only 8 characters as some getpass(3)
* implementations truncate at 8 characters.
*/
- return lutil_passwd_generate( 8 );
+ tmp = lutil_passwd_generate( 8 );
+ if (tmp) {
+ *pass = *tmp;
+ free(tmp);
+ } else {
+ pass->bv_val = NULL;
+ pass->bv_len = 0;
+ }
}
-struct berval * slap_passwd_hash(
- struct berval * cred )
+void
+slap_passwd_hash(
+ struct berval * cred,
+ struct berval * new )
{
+ struct berval *tmp;
#ifdef LUTIL_SHA1_BYTES
char* hash = default_passwd_hash ? default_passwd_hash : "{SSHA}";
#else
#endif
- struct berval *new;
-
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
ldap_pvt_thread_mutex_lock( &passwd_mutex );
#endif
- new = lutil_passwd_hash( cred , hash );
+ tmp = lutil_passwd_hash( cred , hash );
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
ldap_pvt_thread_mutex_unlock( &passwd_mutex );
#endif
+ *new = *tmp;
+ free( tmp );
- return new;
+ return;
}