fix type format

[openldap] / clients / tools / ldapdelete.c

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 42730f14023a824ab97c5e8c196971af466fe9a7..71f13cebe82c6999d7bee226f509ba6f8d53c25f 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * All rights reserved.
  *
@@ -39,6 +39,8 @@
 #include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/unistd.h>
+#include <ac/socket.h>
+#include <ac/time.h>
 
 #include <ldap.h>
 #include "lutil.h"
@@ -74,7 +76,7 @@ usage( void )
 
 
 const char options[] = "r"
-       "cd:D:e:f:h:H:IkKMnO:p:P:QR:U:vVw:WxX:y:Y:Z";
+       "cd:D:e:f:h:H:IkKMnO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
 
 int
 handle_private_option( int i )
@@ -139,7 +141,7 @@ main( int argc, char **argv )
 
     fp = NULL;
 
-       tool_init();
+       tool_init( TOOL_DELETE );
     prog = lutil_progname( "ldapdelete", argc, argv );
 
        tool_args( argc, argv );
@@ -169,13 +171,11 @@ main( int argc, char **argv )
 
        tool_bind( ld );
 
-       if ( assertion || authzid || manageDSAit || noop ) {
-               tool_server_controls( ld, NULL, 0 );
-       }
+       tool_server_controls( ld, NULL, 0 );
 
        retval = rc = 0;
 
-    if ( fp == NULL ) {
+       if ( fp == NULL ) {
                for ( ; optind < argc; ++optind ) {
                        rc = dodelete( ld, argv[ optind ] );
 
@@ -214,10 +214,10 @@ static int dodelete(
 
        if ( verbose ) {
                printf( _("%sdeleting entry \"%s\"\n"),
-                       (not ? "!" : ""), dn );
+                       (dont ? "!" : ""), dn );
        }
 
-       if ( not ) {
+       if ( dont ) {
                return LDAP_SUCCESS;
        }
 
@@ -234,7 +234,7 @@ static int dodelete(
        }
 
        for ( ; ; ) {
-               struct timeval  tv;
+               struct timeval tv;
 
                if ( tool_check_abandon( ld, id ) ) {
                        return LDAP_CANCELLED;
@@ -245,7 +245,7 @@ static int dodelete(
 
                rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, &tv, &res );
                if ( rc < 0 ) {
-                       ldap_perror( ld, "ldapdelete: ldap_result" );
+                       tool_perror( "ldap_result", rc, NULL, NULL, NULL, NULL );
                        return rc;
                }
 
@@ -262,8 +262,10 @@ static int dodelete(
                return rc;
        }
 
-       if( verbose || code != LDAP_SUCCESS ||
-               (matcheddn && *matcheddn) || (text && *text) || (refs && *refs) )
+       if( code != LDAP_SUCCESS ) {
+               tool_perror( "ldap_delete", code, NULL, matcheddn, text, refs );
+       } else if ( verbose && 
+               ((matcheddn && *matcheddn) || (text && *text) || (refs && *refs) ))
        {
                printf( _("Delete Result: %s (%d)\n"),
                        ldap_err2string( code ), code );
@@ -315,7 +317,7 @@ static int deletechildren(
        rc = ldap_search_ext_s( ld, dn, LDAP_SCOPE_ONELEVEL, NULL, attrs, 1,
                NULL, NULL, NULL, -1, &res );
        if ( rc != LDAP_SUCCESS ) {
-               ldap_perror( ld, "ldap_search" );
+               tool_perror( "ldap_search", rc, NULL, NULL, NULL, NULL );
                return( rc );
        }
 
@@ -330,15 +332,15 @@ static int deletechildren(
                        char *dn = ldap_get_dn( ld, e );
 
                        if( dn == NULL ) {
-                               ldap_perror( ld, "ldap_prune" );
-                               ldap_get_option( ld, LDAP_OPT_ERROR_NUMBER, &rc );
+                               ldap_get_option( ld, LDAP_OPT_RESULT_CODE, &rc );
+                               tool_perror( "ldap_prune", rc, NULL, NULL, NULL, NULL );
                                ber_memfree( dn );
                                return rc;
                        }
 
                        rc = deletechildren( ld, dn );
                        if ( rc == -1 ) {
-                               ldap_perror( ld, "ldap_prune" );
+                               tool_perror( "ldap_prune", rc, NULL, NULL, NULL, NULL );
                                ber_memfree( dn );
                                return rc;
                        }
@@ -347,9 +349,9 @@ static int deletechildren(
                                printf( _("\tremoving %s\n"), dn );
                        }
 
-                       rc = ldap_delete_s( ld, dn );
+                       rc = ldap_delete_ext_s( ld, dn, NULL, NULL );
                        if ( rc == -1 ) {
-                               ldap_perror( ld, "ldap_delete" );
+                               tool_perror( "ldap_delete", rc, NULL, NULL, NULL, NULL );
                                ber_memfree( dn );
                                return rc;
 
@@ -389,7 +391,7 @@ static int deletechildren(
        rc = ldap_search_ext_s( ld, dn, LDAP_SCOPE_ONELEVEL, NULL, attrs, 1,
                ctrls, NULL, NULL, -1, &res_se );
        if ( rc != LDAP_SUCCESS ) {
-               ldap_perror( ld, "ldap_search" );
+               tool_perror( "ldap_search", rc, NULL, NULL, NULL, NULL );
                return( rc );
        }
        ber_free( ber, 1 );
@@ -405,8 +407,8 @@ static int deletechildren(
                        char *dn = ldap_get_dn( ld, e );
 
                        if( dn == NULL ) {
-                               ldap_perror( ld, "ldap_prune" );
-                               ldap_get_option( ld, LDAP_OPT_ERROR_NUMBER, &rc );
+                               ldap_get_option( ld, LDAP_OPT_RESULT_CODE, &rc );
+                               tool_perror( "ldap_prune", rc, NULL, NULL, NULL, NULL );
                                ber_memfree( dn );
                                return rc;
                        }
@@ -415,9 +417,9 @@ static int deletechildren(
                                printf( _("\tremoving %s\n"), dn );
                        }
 
-                       rc = ldap_delete_s( ld, dn );
+                       rc = ldap_delete_ext_s( ld, dn, NULL, NULL );
                        if ( rc == -1 ) {
-                               ldap_perror( ld, "ldap_delete" );
+                               tool_perror( "ldap_delete", rc, NULL, NULL, NULL, NULL );
                                ber_memfree( dn );
                                return rc;