From: Luke Howard <lukeh@openldap.org>
Date: Mon, 12 Jun 2006 08:40:39 +0000 (+0000)
Subject: s/ber_tag_t/int where appropriate
X-Git-Tag: OPENLDAP_REL_ENG_2_4_3ALPHA~9^2~141
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=88b499b93dbd535bbef6b5684aa6fb4f72eb6cbd;p=openldap

s/ber_tag_t/int where appropriate
Note about possible ITS#4158 breakage for SLAPI_CONN_DN
---

diff --git a/servers/slapd/slapi/slapi_pblock.c b/servers/slapd/slapi/slapi_pblock.c
index b3644ac55d..ab75cd6783 100644
--- a/servers/slapd/slapi/slapi_pblock.c
+++ b/servers/slapd/slapi/slapi_pblock.c
@@ -483,7 +483,7 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
 		break;
 	case SLAPI_X_OPERATION_DELETE_GLUE_PARENT:
 		PBLOCK_ASSERT_OP( pb, 0 );
-		*((ber_tag_t *)value) = pb->pb_op->o_delete_glue_parent;
+		*((int *)value) = pb->pb_op->o_delete_glue_parent;
 		break;
 	case SLAPI_X_OPERATION_NO_SCHEMA_CHECK:
 		PBLOCK_ASSERT_OP( pb, 0 );
@@ -505,7 +505,7 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
 		break;
 	case SLAPI_X_OPERATION_NO_SUBORDINATE_GLUE:
 		PBLOCK_ASSERT_OP( pb, 0 );
-		*((ber_tag_t *)value) = pb->pb_op->o_no_subordinate_glue;
+		*((int *)value) = pb->pb_op->o_no_subordinate_glue;
 		break;
 	case SLAPI_REQCONTROLS:
 		PBLOCK_ASSERT_OP( pb, 0 );
@@ -586,6 +586,12 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
 		break;
 	case SLAPI_CONN_DN:
 		PBLOCK_ASSERT_CONN( pb );
+#if 0
+		/* This would be necessary to keep plugin compat after the fix in ITS#4158 */
+		if ( pb->pb_op->o_tag == LDAP_REQ_BIND && pb->pb_rs->sr_err == LDAP_SUCCESS )
+			*((char **)value) = pb->pb_op->orb_edn.bv_val;
+		else
+#endif
 		*((char **)value) = pb->pb_conn->c_dn.bv_val;
 		break;
 	case SLAPI_CONN_CLIENTIP: