ITS#7022 cleanup prev commit

[openldap] / libraries / libldap / cancel.c

diff --git a/libraries/libldap/cancel.c b/libraries/libldap/cancel.c
index 82b6852beaebb57d514b74b091119ed97fbdf652..05d866192b5ff5c384388325f29ff663d8111113 100644 (file)
--- a/libraries/libldap/cancel.c
+++ b/libraries/libldap/cancel.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,6 +12,10 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
+/* ACKNOWLEDGEMENTS:
+ * This program was originally developed by Kurt D. Zeilenga for inclusion
+ * in OpenLDAP Software.
+ */
 
 /*
  * LDAPv3 Cancel Operation Request
@@ -44,8 +48,8 @@ ldap_cancel(
        cancelidber = ber_alloc_t( LBER_USE_DER );
        ber_printf( cancelidber, "{i}", cancelid );
        ber_flatten( cancelidber, &cancelidvalp );
-       rc = ldap_extended_operation( ld, LDAP_EXOP_X_CANCEL,
-                       cancelidvalp, sctrls, cctrls, msgidp );
+       rc = ldap_extended_operation( ld, LDAP_EXOP_CANCEL,
+               cancelidvalp, sctrls, cctrls, msgidp );
        ber_free( cancelidber, 1 );
        return rc;
 }
@@ -64,8 +68,8 @@ ldap_cancel_s(
        cancelidber = ber_alloc_t( LBER_USE_DER );
        ber_printf( cancelidber, "{i}", cancelid );
        ber_flatten( cancelidber, &cancelidvalp );
-       rc = ldap_extended_operation_s( ld, LDAP_EXOP_X_CANCEL,
-                       cancelidvalp, sctrls, cctrls, NULL, NULL );
+       rc = ldap_extended_operation_s( ld, LDAP_EXOP_CANCEL,
+               cancelidvalp, sctrls, cctrls, NULL, NULL );
        ber_free( cancelidber, 1 );
        return rc;
 }