Fix matched values bug

[openldap] / servers / slapd / passwd.c

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index 8382f284aec89f51f88501c72564b4787f2fba81..06cc1586a87478d2285866f4d7b2badd4b3d0bf0 100644 (file)
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -16,6 +16,7 @@
 
 #include "slap.h"
 
+#include <lber_pvt.h>
 #include <lutil.h>
 
 int passwd_extop(
@@ -28,6 +29,7 @@ int passwd_extop(
        const char **text,
        BerVarray *refs )
 {
+       Backend *be;
        int rc;
 
        assert( reqoid != NULL );
@@ -38,28 +40,47 @@ int passwd_extop(
                return LDAP_STRONG_AUTH_REQUIRED;
        }
 
-       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;
+       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
+       be = conn->c_authz_backend;
+       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
-               } 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 );
-                       rc = LDAP_REFERRAL;
+       if( be && !be->be_extended ) {
+               *text = "operation not supported for current user";
+               return LDAP_UNWILLING_TO_PERFORM;
+       }
 
-               } else {
-                       rc = conn->c_authz_backend->be_extended(
-                               conn->c_authz_backend, conn, op,
-                               reqoid, reqdata,
-                               rspoid, rspdata, rspctrls,
-                               text, refs );
-               }
+       {
+               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( be == NULL ) {
+#ifdef HAVE_CYRUS_SASL
+               rc = slap_sasl_setpass( conn, op,
+                       reqoid, reqdata,
+                       rspoid, rspdata, rspctrls,
+                       text );
+#else
+               *text = "no authz backend";
+               rc = LDAP_OTHER;
+#endif
+
+       } else if( be->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;
 
        } else {
-               *text = "operation not supported for current user";
-               rc = LDAP_UNWILLING_TO_PERFORM;
+               rc = be->be_extended(
+                       be, conn, op,
+                       reqoid, reqdata,
+                       rspoid, rspdata, rspctrls,
+                       text, refs );
        }
 
        return rc;
@@ -81,6 +102,11 @@ int slap_passwd_parse( struct berval *reqdata,
                return LDAP_SUCCESS;
        }
 
+       if( reqdata->bv_len == 0 ) {
+               *text = "empty request data field";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
        /* ber_init2 uses reqdata directly, doesn't allocate new buffers */
        ber_init2( ber, reqdata, 0 );
 
@@ -197,7 +223,6 @@ decoding_error:
                        (long) len, 0, 0 );
 #endif
 
-
                *text = "data decoding error";
                rc = LDAP_PROTOCOL_ERROR;
        }
@@ -314,13 +339,17 @@ slap_passwd_hash(
 #endif
 
        tmp = lutil_passwd_hash( cred , hash );
-       assert( tmp != NULL );
        
 #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
        ldap_pvt_thread_mutex_unlock( &passwd_mutex );
 #endif
+
+       if( tmp == NULL ) {
+               new->bv_len = 0;
+               new->bv_val = NULL;
+       }
+
        *new = *tmp;
        free( tmp );
-
        return;
 }