Import nextid cleanup from devel.

[openldap] / servers / slapd / back-ldbm / bind.c

diff --git a/servers/slapd/back-ldbm/bind.c b/servers/slapd/back-ldbm/bind.c
index 591e488c9cc98e27ef309a81dc5268c8dd8b1965..6b8a972a28a1c2c3fc6dcf02447ef2f5a3891417 100644 (file)
--- a/servers/slapd/back-ldbm/bind.c
+++ b/servers/slapd/back-ldbm/bind.c
@@ -13,23 +13,12 @@
 #include "back-ldbm.h"
 #include "proto-back-ldbm.h"
 
-#ifdef SLAPD_SHA1
-#include <lutil_sha1.h>
-#endif /* SLAPD_SHA1 */
-
-#ifdef SLAPD_MD5
-#include <lutil_md5.h>
-#endif /* SLAPD_MD5 */
-
 #include <lutil.h>
 
 #ifdef HAVE_KERBEROS
 extern int     krbv4_ldap_auth();
 #endif
 
-#ifdef SLAPD_CRYPT
-pthread_mutex_t crypt_mutex;
-
 static int
 crypted_value_find(
        struct berval       **vals,
@@ -41,66 +30,23 @@ crypted_value_find(
 {
        int     i;
        for ( i = 0; vals[i] != NULL; i++ ) {
-               if ( syntax != SYNTAX_BIN && strncasecmp( "{CRYPT}",
-                       vals[i]->bv_val, (sizeof("{CRYPT}") - 1 ) ) == 0 ) {
-                               char *userpassword = vals[i]->bv_val + sizeof("{CRYPT}") - 1;
-                               pthread_mutex_lock( &crypt_mutex );
-                               if (strcmp(userpassword, crypt(cred->bv_val,
-                                               userpassword)) == 0) {
-                                       pthread_mutex_unlock( &crypt_mutex );
-                                       return ( 0 );
-                               }
-                               pthread_mutex_unlock( &crypt_mutex );
-#ifdef SLAPD_MD5
-               } else if ( syntax != SYNTAX_BIN && strncasecmp( "{MD5}",
-                       vals[i]->bv_val, (sizeof("{MD5}") - 1 ) ) == 0 ) {
-                               ldap_MD5_CTX MD5context;
-                               unsigned char MD5digest[20];
-                               char base64digest[29];  /* ceiling(sizeof(input)/3) * 4 + 1 */
+               if ( syntax != SYNTAX_BIN ) {
+                       int result;
 
-                               char *userpassword = vals[i]->bv_val + sizeof("{MD5}") - 1;
-
-                               ldap_MD5Init(&MD5context);
-                               ldap_MD5Update(&MD5context,
-                                       (unsigned char *) cred->bv_val,
-                                       strlen(cred->bv_val));
-                               ldap_MD5Final(MD5digest, &MD5context);
-
-                               if (b64_ntop(MD5digest, sizeof(MD5digest),
-                                       base64digest, sizeof(base64digest)) < 0)
-                               {
-                                       return ( 1 );
-                               }
-
-                               if (strcmp(userpassword, base64digest) == 0) {
-                                       return ( 0 );
-                               }
-#endif /* SLAPD_MD5 */
-#ifdef SLAPD_SHA1
-               } else if ( syntax != SYNTAX_BIN && strncasecmp( "{SHA}",
-                       vals[i]->bv_val, (sizeof("{SHA}") - 1 ) ) == 0 ) {
-                               ldap_SHA1_CTX SHA1context;
-                               unsigned char SHA1digest[20];
-                               char base64digest[29];  /* ceiling(sizeof(input)/3) * 4 + 1 */
+#ifdef SLAPD_CRYPT
+                       pthread_mutex_lock( &crypt_mutex );
+#endif
 
-                               char *userpassword = vals[i]->bv_val + sizeof("{SHA}") - 1;
+                       result = lutil_passwd(
+                               (char*) cred->bv_val,
+                               (char*) vals[i]->bv_val);
 
-                               ldap_SHA1Init(&SHA1context);
-                               ldap_SHA1Update(&SHA1context,
-                                       (unsigned char *) cred->bv_val,
-                                       strlen(cred->bv_val));
-                               ldap_SHA1Final(SHA1digest, &SHA1context);
+#ifdef SLAPD_CRYPT
+                       pthread_mutex_unlock( &crypt_mutex );
+#endif
 
-                               if (b64_ntop(SHA1digest, sizeof(SHA1digest),
-                                       base64digest, sizeof(base64digest)) < 0)
-                               {
-                                       return ( 1 );
-                               }
+                       return result;
 
-                               if (strcmp(userpassword, base64digest) == 0) {
-                                       return ( 0 );
-                               }
-#endif /* SLAPD_SHA1 */
                } else {
                 if ( value_cmp( vals[i], v, syntax, normalize ) == 0 ) {
                         return( 0 );
@@ -110,7 +56,6 @@ crypted_value_find(
 
        return( 1 );
 }
-#endif /* SLAPD_CRYPT */
 
 int
 ldbm_back_bind(
@@ -119,14 +64,15 @@ ldbm_back_bind(
     Operation          *op,
     char               *dn,
     int                        method,
-    struct berval      *cred
+    struct berval      *cred,
+       char**  edn
 )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
        Entry           *e;
        Attribute       *a;
        int             rc;
-       char            *matched = NULL;
+       char            *matched;
 #ifdef HAVE_KERBEROS
        char            krbname[MAX_K_NAME_SZ + 1];
        AUTH_DAT        ad;
@@ -134,6 +80,8 @@ ldbm_back_bind(
 
        Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_bind: dn: %s\n", dn, 0, 0);
 
+       *edn = NULL;
+
        /* get entry with reader lock */
        if ( (e = dn2entry_r( be, dn, &matched )) == NULL ) {
                /* allow noauth binds */
@@ -146,6 +94,7 @@ ldbm_back_bind(
                        rc = 1;
                } else if ( be_isroot_pw( be, dn, cred ) ) {
                        /* front end will send result */
+                       *edn = ch_strdup( be_root_dn( be ) );
                        rc = 0;
                } else {
                        send_ldap_result( conn, op, LDAP_NO_SUCH_OBJECT, matched, NULL );
@@ -157,6 +106,8 @@ ldbm_back_bind(
                return( rc );
        }
 
+       *edn = ch_strdup( e->e_dn );
+
        /* check for deleted */
 
        switch ( method ) {
@@ -169,6 +120,7 @@ ldbm_back_bind(
                        goto return_results;
                } else if ( be_isroot_pw( be, dn, cred ) ) {
                        /* front end will send result */
+                       *edn = ch_strdup( be_root_dn( be ) );
                        rc = 0;
                        goto return_results;
                }
@@ -176,6 +128,7 @@ ldbm_back_bind(
                if ( (a = attr_find( e->e_attrs, "userpassword" )) == NULL ) {
                        if ( be_isroot_pw( be, dn, cred ) ) {
                                /* front end will send result */
+                               *edn = ch_strdup( be_root_dn( be ) );
                                rc = 0;
                                goto return_results;
                        }
@@ -185,14 +138,11 @@ ldbm_back_bind(
                        goto return_results;
                }
 
-#ifdef SLAPD_CRYPT
                if ( crypted_value_find( a->a_vals, cred, a->a_syntax, 0, cred ) != 0 )
-#else
-               if ( value_find( a->a_vals, cred, a->a_syntax, 0 ) != 0 )
-#endif
                {
                        if ( be_isroot_pw( be, dn, cred ) ) {
                                /* front end will send result */
+                               *edn = ch_strdup( be_root_dn( be ) );
                                rc = 0;
                                goto return_results;
                        }
@@ -239,6 +189,7 @@ ldbm_back_bind(
                                goto return_results;
                        }
                }
+               rc = 0;
                break;
 
        case LDAP_AUTH_KRBV42: