Merge remote-tracking branch 'origin/mdb.master'

[openldap] / servers / slapd / back-mdb / dn2entry.c

diff --git a/servers/slapd/back-mdb/dn2entry.c b/servers/slapd/back-mdb/dn2entry.c
index e12a9da2a659ebd95ec961f5d76315a114653756..8c5e14170345eb03b6775eec03dd07e017de1c9a 100644 (file)
--- a/servers/slapd/back-mdb/dn2entry.c
+++ b/servers/slapd/back-mdb/dn2entry.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2011 The OpenLDAP Foundation.
+ * Copyright 2000-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,8 +31,10 @@ int
 mdb_dn2entry(
        Operation *op,
        MDB_txn *tid,
+       MDB_cursor *m2,
        struct berval *dn,
        Entry **e,
+       ID *nsubs,
        int matched )
 {
        struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
@@ -42,11 +44,11 @@ mdb_dn2entry(
        MDB_cursor *mc;
 
        Debug(LDAP_DEBUG_TRACE, "mdb_dn2entry(\"%s\")\n",
-               dn->bv_val, 0, 0 );
+               dn->bv_val ? dn->bv_val : "", 0, 0 );
 
        *e = NULL;
 
-       rc = mdb_dn2id( op, tid, dn, &id, &mbv, &nmbv );
+       rc = mdb_dn2id( op, tid, m2, dn, &id, nsubs, &mbv, &nmbv );
        if ( rc ) {
                if ( matched ) {
                        rc2 = mdb_cursor_open( tid, mdb->mi_id2entry, &mc );