Turn these functions on again. Need backend_attribute for SASLauthz stuff.

Fix to work with NULL op.

diff --git a/servers/slapd/back-bdb/attribute.c b/servers/slapd/back-bdb/attribute.c
index d9dccddab9d2217e7d43b19cb66d351624261d91..38203b994d3e245290427b0d29eb1e30a4962c8e 100644 (file)
--- a/servers/slapd/back-bdb/attribute.c
+++ b/servers/slapd/back-bdb/attribute.c
@@ -30,7 +30,7 @@ bdb_attribute(
        BerVarray *vals )
 {
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
-       struct bdb_op_info *boi = (struct bdb_op_info *) op->o_private;
+       struct bdb_op_info *boi = NULL;
        DB_TXN *txn = NULL;
        Entry *e;
        int     i, j = 0, rc;
@@ -60,6 +60,7 @@ bdb_attribute(
                target ? target->e_ndn : "", 0, 0 ); 
 #endif
 
+       if( op ) boi = (struct bdb_op_info *) op->o_private;
        if( boi != NULL && be == boi->boi_bdb ) {
                txn = boi->boi_txn;
        }

diff --git a/servers/slapd/back-bdb/group.c b/servers/slapd/back-bdb/group.c
index 70d1523be9529c2edee66ec126f3911cc62e9f3f..2000de520996c7f849c70efc136ce9ac9bd2c2b1 100644 (file)
--- a/servers/slapd/back-bdb/group.c
+++ b/servers/slapd/back-bdb/group.c
@@ -34,7 +34,7 @@ bdb_group(
 )
 {
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
-       struct bdb_op_info *boi = (struct bdb_op_info *) op->o_private;
+       struct bdb_op_info *boi = NULL;
        DB_TXN *txn = NULL;
        Entry *e;
        int     rc = 1;
@@ -71,6 +71,7 @@ bdb_group(
                target->e_ndn, 0, 0 ); 
 #endif
 
+       if( op ) boi = (struct bdb_op_info *) op->o_private;
        if( boi != NULL && be == boi->boi_bdb ) {
                txn = boi->boi_txn;
        }

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 0a366fd2b7df8221948824619e4dd7a9b591d235..8563b3ee83a88388177fda06395349a6d4c5835e 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -561,7 +561,7 @@ bdb_initialize(
 
        bi->bi_extended = bdb_extended;
 
-#if 0
+#if 1
        /*
         * these routines (and their callers) are not yet designed
         * to work with transaction.  Using them may cause deadlock.