--- servers/slapd/back-ldap/chain.c	2005/08/09 21:04:02	1.12.2.9
+++ servers/slapd/back-ldap/chain.c	2005/11/03 18:03:00	1.12.2.10
@@ -1,5 +1,5 @@
 /* chain.c - chain LDAP operations */
-/* $OpenLDAP: pkg/ldap/servers/slapd/back-ldap/chain.c,v 1.31 2005/07/31 02:56:27 lukeh Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/back-ldap/chain.c,v 1.12.2.9 2005/08/09 21:04:02 kurt Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
  * Copyright 2003-2005 The OpenLDAP Foundation.
@@ -576,7 +576,7 @@ ldap_chain_response( Operation *op, Slap
 
 #ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
 	if ( rc != LDAP_SUCCESS || sc2.sc_private == LDAP_CH_ERR ) {
-		if ( rs->sr_err == LDAP_CANNOT_CHAIN ) {
+		if ( rs->sr_err == LDAP_X_CANNOT_CHAIN ) {
 			goto cannot_chain;
 		}
 
@@ -584,7 +584,8 @@ ldap_chain_response( Operation *op, Slap
 		case LDAP_CHAINING_REQUIRED:
 cannot_chain:;
 			op->o_callback = NULL;
-			send_ldap_error( op, rs, LDAP_CANNOT_CHAIN, "operation cannot be completed without chaining" );
+			send_ldap_error( op, rs, LDAP_X_CANNOT_CHAIN,
+				"operation cannot be completed without chaining" );
 			break;
 
 		default: