- LDAP_SYNCREPL defined in include/ldap.h

[openldap] / servers / slapd / passwd.c

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index bd6157d5e088047fb042cc49bb91ec73e713bbc4..b10bbe4b331820d24bc762198a4cba11e109509f 100644 (file)
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -20,72 +20,61 @@
 #include <lutil.h>
 
 int passwd_extop(
-       Connection *conn, Operation *op,
-       struct berval *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( ber_bvcmp( &slap_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 && !be->be_extended ) {
-               *text = "operation not supported for current user";
+       if( op->o_bd && !op->o_bd->be_extended ) {
+               rs->sr_text = "operation not supported for current user";
                return LDAP_UNWILLING_TO_PERFORM;
        }
 
-       {
-               rc = backend_check_restrictions( be, conn, op, &slap_EXOP_MODIFY_PASSWD, text );
+       if (backend_check_restrictions( op, rs,
+                       (struct berval *)&slap_EXOP_MODIFY_PASSWD ) != LDAP_SUCCESS) {
+               return rs->sr_err;
        }
 
-       if( rc != LDAP_SUCCESS ) {
-               return rc;
-       }
-
-       if( be == NULL ) {
+       if( op->o_bd == NULL ) {
 #ifdef HAVE_CYRUS_SASL
-               rc = slap_sasl_setpass( conn, op,
-                       reqoid, reqdata,
-                       rspoid, rspdata, rspctrls,
-                       text );
+               rs->sr_err = slap_sasl_setpass( op, rs );
 #else
-               *text = "no authz backend";
-               rc = LDAP_OTHER;
+               rs->sr_text = "no authz backend";
+               rs->sr_err = LDAP_OTHER;
 #endif
 
-#ifndef SLAPD_MULTIMASTER
+#if defined(LDAP_SYNCREPL) || !defined(SLAPD_MULTIMASTER)
        /* This does not apply to multi-master case */
-       } else if( be->be_update_ndn.bv_len ) {
+       } 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,
@@ -270,7 +259,8 @@ int
 slap_passwd_check(
        Connection *conn,
        Attribute *a,
-       struct berval *cred )
+       struct berval *cred,
+       const char **text )
 {
        int result = 1;
        struct berval *bv;
@@ -278,12 +268,12 @@ slap_passwd_check(
 #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;
                }
@@ -325,7 +315,8 @@ slap_passwd_generate( struct berval *pass )
 void
 slap_passwd_hash(
        struct berval * cred,
-       struct berval * new )
+       struct berval * new,
+       const char **text )
 {
        struct berval *tmp;
 #ifdef LUTIL_SHA1_BYTES
@@ -339,7 +330,7 @@ slap_passwd_hash(
        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 );