From: Luke Howard <lukeh@openldap.org>
Date: Tue, 21 Jan 2003 15:21:55 +0000 (+0000)
Subject: Allow coalesce pblock types.
X-Git-Tag: NO_SLAP_OP_BLOCKS~555
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6469f164a8c6a4914807f81236d8d28eb2c638e9;p=openldap

Allow coalesce pblock types.
Take care with pblock values that need to be duplicated
---

diff --git a/servers/slapd/slapi/slapi_pblock.c b/servers/slapd/slapi/slapi_pblock.c
index 204468dc27..786f9cc9ea 100644
--- a/servers/slapd/slapi/slapi_pblock.c
+++ b/servers/slapd/slapi/slapi_pblock.c
@@ -196,6 +196,8 @@ isOkNetscapeParam( int param )
 	case SLAPI_RESULT_CODE:
 	case SLAPI_RESULT_TEXT:
 	case SLAPI_RESULT_MATCHED:
+	case SLAPI_PLUGIN_OPATTR_COALESCE_FN:
+	case SLAPI_PLUGIN_OPATTR_COALESCE_DATA:
 		return LDAP_SUCCESS;
 	default:
 		return INVALID_PARAM;
@@ -413,9 +415,11 @@ slapi_pblock_set( Slapi_PBlock *pb, int arg, void *value )
 
 	switch ( arg ) {
         case SLAPI_CONN_DN:
-        case SLAPI_CONN_AUTHTYPE:
+        case SLAPI_CONN_AUTHMETHOD:
         case SLAPI_IBM_CONN_DN_ALT:
         case SLAPI_IBM_CONN_DN_ORIG:
+        case SLAPI_RESULT_TEXT:
+        case SLAPI_RESULT_MATCHED:
 		if ( value != NULL ) {
 			pTmp = (void *)slapi_ch_strdup((char *)value);
 			if ( pTmp == NULL ) {