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

[openldap] / servers / slapd / slapi / slapi_ops.c

diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c
index 7db0c315adfa8fdb843fde0ef7ba25fac4090706..c1e9f550a514c391c708eabbeae830018824f83e 100644 (file)
--- a/servers/slapd/slapi/slapi_ops.c
+++ b/servers/slapd/slapi/slapi_ops.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2002-2013 The OpenLDAP Foundation.
+ * Copyright 2002-2014 The OpenLDAP Foundation.
  * Portions Copyright 1997,2002-2003 IBM Corporation.
  * All rights reserved.
  *
@@ -384,7 +384,6 @@ slapi_int_connection_done_pb( Slapi_PBlock *pb )
 static int
 slapi_int_func_internal_pb( Slapi_PBlock *pb, slap_operation_t which )
 {
-       BI_op_bind              **func;
        SlapReply               *rs = pb->pb_rs;
        int                     rc;
 
@@ -397,9 +396,7 @@ slapi_int_func_internal_pb( Slapi_PBlock *pb, slap_operation_t which )
        }
 
        pb->pb_op->o_bd = frontendDB;
-       func = &frontendDB->be_bind;
-
-       return func[which]( pb->pb_op, pb->pb_rs );
+       return (&frontendDB->be_bind)[which]( pb->pb_op, pb->pb_rs );
 }
 
 int
@@ -953,4 +950,3 @@ slapi_delete_internal(
 }
 
 #endif /* LDAP_SLAPI */
-