Move connectionless connection init to startup (may not be in the

[openldap] / libraries / libldap / delete.c

diff --git a/libraries/libldap/delete.c b/libraries/libldap/delete.c
index 70ad60e3132122fe422ed332e737d5615d28f063..16e768cb534e7f4ac9cec5f0e1fd27e5242dd88a 100644 (file)
--- a/libraries/libldap/delete.c
+++ b/libraries/libldap/delete.c
@@ -1,13 +1,19 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/*  Portions
- *  Copyright (c) 1990 Regents of the University of Michigan.
- *  All rights reserved.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
  *
- *  delete.c
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
+ * All rights reserved.
  */
 /*
  * Portions Copyright (C) The Internet Society (1997)
@@ -53,11 +59,7 @@ ldap_delete_ext(
        BerElement      *ber;
        ber_int_t       id;
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( OPERATION, ENTRY, "ldap_delete_ext\n", 0,0,0 );
-#else
        Debug( LDAP_DEBUG_TRACE, "ldap_delete_ext\n", 0, 0, 0 );
-#endif
 
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
@@ -145,11 +147,7 @@ ldap_delete( LDAP *ld, LDAP_CONST char *dn )
         *      DelRequet ::= DistinguishedName,
         */
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( OPERATION, ENTRY, "ldap_delete\n", 0,0,0 );
-#else
        Debug( LDAP_DEBUG_TRACE, "ldap_delete\n", 0, 0, 0 );
-#endif
 
        return ldap_delete_ext( ld, dn, NULL, NULL, &msgid ) == LDAP_SUCCESS
                ? msgid : -1 ;