/* bind.c - ldbm backend bind and unbind routines */
/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include <lutil.h>
int passwd_extop(
- SLAP_EXTOP_CALLBACK_FN ext_callback,
- Connection *conn, Operation *op, char *oid,
+ Connection *conn, Operation *op,
+ const char *reqoid,
struct berval *reqdata,
+ char **rspoid,
struct berval **rspdata,
LDAPControl ***rspctrls,
- char **text )
+ const char **text,
+ struct berval ***refs )
{
int rc;
- assert( oid != NULL );
- assert( strcmp( LDAP_EXOP_X_MODIFY_PASSWD, oid ) == 0 );
+ assert( reqoid != NULL );
+ assert( strcmp( LDAP_EXOP_X_MODIFY_PASSWD, reqoid ) == 0 );
if( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
- *text = ch_strdup("only authenicated users may change passwords");
+ *text = "only authenicated users may change passwords";
return LDAP_STRONG_AUTH_REQUIRED;
}
- if( conn->c_authz_backend != NULL &&
- conn->c_authz_backend->be_extended )
- {
- rc = conn->c_authz_backend->be_extended(
- conn->c_authz_backend,
- conn, op, oid, reqdata, rspdata, rspctrls, text );
+ if( conn->c_authz_backend != NULL && conn->c_authz_backend->be_extended ) {
+ if( conn->c_authz_backend->be_restrictops & SLAP_RESTRICT_OP_MODIFY ) {
+ *text = "authorization database is read only";
+ rc = LDAP_UNWILLING_TO_PERFORM;
+
+ } else if( conn->c_authz_backend->be_update_ndn != NULL ) {
+ /* we SHOULD return a referral in this case */
+ *refs = conn->c_authz_backend->be_update_refs;
+ rc = LDAP_REFERRAL;
+
+ } else {
+ rc = conn->c_authz_backend->be_extended(
+ conn->c_authz_backend, conn, op,
+ reqoid, reqdata,
+ rspoid, rspdata, rspctrls,
+ text, refs );
+ }
} else {
- *text = ch_strdup("operation not supported for current user");
+ *text = "operation not supported for current user";
rc = LDAP_UNWILLING_TO_PERFORM;
}
int slap_passwd_parse( struct berval *reqdata,
struct berval **id,
- struct berval **old,
- struct berval **new,
- char **text )
+ struct berval **oldpass,
+ struct berval **newpass,
+ const char **text )
{
int rc = LDAP_SUCCESS;
ber_tag_t tag;
if( ber == NULL ) {
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ber_init failed\n",
0, 0, 0 );
- *text = ch_strdup("password decoding error");
+ *text = "password decoding error";
return LDAP_PROTOCOL_ERROR;
}
}
if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_OLD ) {
- if( old == NULL ) {
+ if( oldpass == NULL ) {
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD not allowed.\n",
0, 0, 0 );
*text = "use bind to verify old password";
goto done;
}
- tag = ber_scanf( ber, "O", old );
+ tag = ber_scanf( ber, "O", oldpass );
if( tag == LBER_ERROR ) {
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID parse failed.\n",
}
if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_NEW ) {
- if( new == NULL ) {
+ if( newpass == NULL ) {
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: NEW not allowed.\n",
0, 0, 0 );
*text = "user specified passwords disallowed";
goto done;
}
- tag = ber_scanf( ber, "O", new );
+ tag = ber_scanf( ber, "O", newpass );
if( tag == LBER_ERROR ) {
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD parse failed.\n",
"slap_passwd_parse: decoding error, len=%ld\n",
(long) len, 0, 0 );
- *text = ch_strdup("data decoding error");
+ *text = "data decoding error";
rc = LDAP_PROTOCOL_ERROR;
}
*id = NULL;
}
- if( old != NULL ) {
- ber_bvfree( *old );
- *old = NULL;
+ if( oldpass != NULL ) {
+ ber_bvfree( *oldpass );
+ *oldpass = NULL;
}
- if( new != NULL ) {
- ber_bvfree( *new );
- *new = NULL;
+ if( newpass != NULL ) {
+ ber_bvfree( *newpass );
+ *newpass = NULL;
}
}
if( ber == NULL ) return NULL;
- rc = ber_printf( ber, "{tO}",
+ rc = ber_printf( ber, "{tON}",
LDAP_TAG_EXOP_X_MODIFY_PASSWD_GEN, cred );
if( rc == -1 ) {
int
slap_passwd_check(
+ Connection *conn,
Attribute *a,
struct berval *cred )
{
int i;
- for ( i = 0; a->a_vals[i] != NULL; i++ ) {
- int result;
+ int result = 1;
-#ifdef SLAPD_CRYPT
- ldap_pvt_thread_mutex_lock( &crypt_mutex );
+#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;
#endif
-
- result = lutil_passwd( a->a_vals[i], cred, NULL );
-
-#ifdef SLAPD_CRYPT
- ldap_pvt_thread_mutex_unlock( &crypt_mutex );
#endif
- return result;
+ for ( i = 0; a->a_vals[i] != NULL; i++ ) {
+ if( !lutil_passwd( a->a_vals[i], cred, NULL ) ) {
+ result = 0;
+ break;
+ }
}
- return( 1 );
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+#ifdef SLAPD_SPASSWD
+ lutil_passwd_sasl_conn = NULL;
+#endif
+ ldap_pvt_thread_mutex_unlock( &passwd_mutex );
+#endif
+
+ return result;
}
struct berval * slap_passwd_generate( void )
struct berval *new;
-#ifdef SLAPD_CRYPT
- ldap_pvt_thread_mutex_lock( &crypt_mutex );
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+ ldap_pvt_thread_mutex_lock( &passwd_mutex );
#endif
new = lutil_passwd_hash( cred , hash );
-#ifdef SLAPD_CRYPT
- ldap_pvt_thread_mutex_unlock( &crypt_mutex );
+#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
+ ldap_pvt_thread_mutex_unlock( &passwd_mutex );
#endif
return new;