]> git.sur5r.net Git - openldap/blobdiff - clients/tools/ldapdelete.c
Plug memory leaks from ldap_get_option().
[openldap] / clients / tools / ldapdelete.c
index 6ad029a00f9246d432fa89cf64c7e7da346a57c0..26424fea6546fda3651940e70108c566a86369f1 100644 (file)
@@ -1,7 +1,7 @@
 /* ldapdelete.c - simple program to delete an entry using LDAP */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
 
 #include <ac/stdlib.h>
 #include <ac/ctype.h>
-
-#include <ac/signal.h>
 #include <ac/string.h>
 #include <ac/unistd.h>
 
-#include <lber.h>
 #include <ldap.h>
+#include "lutil.h"
+#include "lutil_ldap.h"
+#include "ldap_defaults.h"
+
+#include "common.h"
+
+
+static int     prune = 0;
 
-static char    *binddn = NULL;
-static char    *passwd = NULL;
-static char    *ldaphost = NULL;
-static int     ldapport = 0;
-static int  prune = 0;
-static int     not, verbose, contoper;
-static LDAP    *ld;
 
 static int dodelete LDAP_P((
-    LDAP       *ld,
-    char       *dn));
+    LDAP *ld,
+    const char *dn));
+
+static int deletechildren LDAP_P((
+       LDAP *ld,
+       const char *dn ));
 
-static int deletechildren LDAP_P(( LDAP *ld,
-                                   char *dn ));
+void
+usage( void )
+{
+       fprintf( stderr,
+"Delete entries from an LDAP server\n\n"
+"usage: %s [options] [dn]...\n"
+"      dn: list of DNs to delete. If not given, it will be readed from stdin\n"
+"          or from the file specified with \"-f file\".\n"
+"Delete Options:\n"
+"  -r         delete recursively\n"
+                        , prog );
+       tool_common_usage();
+       exit( EXIT_FAILURE );
+}
+
+
+const char options[] = "r" "cCd:D:e:f:h:H:IkKMnO:p:P:QR:U:vw:WxX:y:Y:Z";
 
 int
-main( int argc, char **argv )
+handle_private_option( int i )
 {
-       char            *usage = "usage: %s [-n] [-v] [-k] [-W] [-M[M]] [-r] [-d debug-level] [-f file] [-h ldaphost] [-P version] [-p ldapport] [-D binddn] [-w passwd] [dn]...\n";
-    char               buf[ 4096 ];
-    FILE               *fp;
-       int             i, rc, authmethod, want_bindpw, version, debug, manageDSAit;
+       switch ( i ) {
+#if 0
+               int crit;
+               char *control, *cvalue;
+       case 'E': /* delete controls */
+               if( version == LDAP_VERSION2 ) {
+                       fprintf( stderr, "%s: -E incompatible with LDAPv%d\n",
+                               prog, version );
+                       exit( EXIT_FAILURE );
+               }
 
-    not = verbose = contoper = want_bindpw = debug = manageDSAit = 0;
-    fp = NULL;
-    authmethod = LDAP_AUTH_SIMPLE;
-       version = -1;
-
-    while (( i = getopt( argc, argv, "WMnvkKcrh:P:p:D:w:d:f:" )) != EOF ) {
-       switch( i ) {
-       case 'k':       /* kerberos bind */
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-               authmethod = LDAP_AUTH_KRBV4;
-#else
-               fprintf (stderr, "%s was not compiled with Kerberos support\n", argv[0]);
-               fprintf( stderr, usage, argv[0] );
-               return( EXIT_FAILURE );
-#endif
-           break;
-       case 'K':       /* kerberos bind, part one only */
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-               authmethod = LDAP_AUTH_KRBV41;
-#else
-               fprintf (stderr, "%s was not compiled with Kerberos support\n", argv[0]);
-               fprintf( stderr, usage, argv[0] );
-               return( EXIT_FAILURE );
-#endif
-           break;
-       case 'c':       /* continuous operation mode */
-           ++contoper;
-           break;
-       case 'h':       /* ldap host */
-           ldaphost = strdup( optarg );
-           break;
-       case 'D':       /* bind DN */
-           binddn = strdup( optarg );
-           break;
-       case 'w':       /* password */
-           passwd = strdup( optarg );
-               {
-                       char* p;
+               /* should be extended to support comma separated list of
+                *      [!]key[=value] parameters, e.g.  -E !foo,bar=567
+                */
 
-                       for( p = optarg; *p == '\0'; p++ ) {
-                               *p = '*';
-                       }
+               crit = 0;
+               cvalue = NULL;
+               if( optarg[0] == '!' ) {
+                       crit = 1;
+                       optarg++;
                }
-           break;
-       case 'f':       /* read DNs from a file */
-           if (( fp = fopen( optarg, "r" )) == NULL ) {
-               perror( optarg );
-               exit( EXIT_FAILURE );
-           }
-           break;
-       case 'd':
-           debug |= atoi( optarg );
-           break;
-       case 'p':
-           ldapport = atoi( optarg );
-           break;
-       case 'n':       /* print deletes, don't actually do them */
-           ++not;
-           break;
+
+               control = strdup( optarg );
+               if ( (cvalue = strchr( control, '=' )) != NULL ) {
+                       *cvalue++ = '\0';
+               }
+               fprintf( stderr, "Invalid delete control name: %s\n", control );
+               usage();
+#endif
+
        case 'r':
                prune = 1;
                break;
-       case 'v':       /* verbose mode */
-           verbose++;
-           break;
-       case 'M':
-               /* enable Manage DSA IT */
-               manageDSAit++;
-               break;
-       case 'W':
-               want_bindpw++;
-               break;
-       case 'P':
-               switch( atoi(optarg) )
-               {
-               case 2:
-                       version = LDAP_VERSION2;
-                       break;
-               case 3:
-                       version = LDAP_VERSION3;
-                       break;
-               default:
-                       fprintf( stderr, "protocol version should be 2 or 3\n" );
-                   fprintf( stderr, usage, argv[0] );
-                   return( EXIT_FAILURE );
-               }
-               break;
+
        default:
-           fprintf( stderr, usage, argv[0] );
-           return( EXIT_FAILURE );
+               return 0;
        }
-    }
+       return 1;
+}
 
-       if( authmethod != LDAP_AUTH_SIMPLE ) {
-               if( version == LDAP_VERSION3 ) {
-                       fprintf(stderr, "Kerberos requires LDAPv2\n");
-                       return EXIT_FAILURE;
-               }
-               version = LDAP_VERSION2;
-       }
 
-       if( manageDSAit ) {
-               if( version == LDAP_VERSION2 ) {
-                       fprintf(stderr, "manage DSA control requires LDAPv3\n");
-                       return EXIT_FAILURE;
-               }
-               version = LDAP_VERSION3;
-       }
+static void
+private_conn_setup( LDAP *ld )
+{
+       /* this seems prudent for searches below */
+       int deref = LDAP_DEREF_NEVER;
+       ldap_set_option( ld, LDAP_OPT_DEREF, &deref );
+}
 
-    if ( fp == NULL ) {
+
+int
+main( int argc, char **argv )
+{
+       char            buf[ 4096 ];
+       FILE            *fp;
+       LDAP            *ld;
+       int             rc, retval;
+
+    fp = NULL;
+
+    prog = lutil_progname( "ldapdelete", argc, argv );
+
+       tool_args( argc, argv );
+
+       if ( infile != NULL ) {
+               if (( fp = fopen( infile, "r" )) == NULL ) {
+                       perror( optarg );
+                       exit( EXIT_FAILURE );
+           }
+       } else {
        if ( optind >= argc ) {
            fp = stdin;
        }
     }
 
-       if ( debug ) {
-               if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_SUCCESS ) {
-                       fprintf( stderr, "Could not set LBER_OPT_DEBUG_LEVEL %d\n", debug );
-               }
-               if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_SUCCESS ) {
-                       fprintf( stderr, "Could not set LDAP_OPT_DEBUG_LEVEL %d\n", debug );
+       ld = tool_conn_setup( 0, &private_conn_setup );
+
+       if ( pw_file || want_bindpw ) {
+               if ( pw_file ) {
+                       rc = lutil_get_filed_password( pw_file, &passwd );
+                       if( rc ) return EXIT_FAILURE;
+               } else {
+                       passwd.bv_val = getpassphrase( "Enter LDAP Password: " );
+                       passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
                }
        }
 
-#ifdef SIGPIPE
-       (void) SIGNAL( SIGPIPE, SIG_IGN );
-#endif
+       tool_bind( ld );
 
-    if (( ld = ldap_init( ldaphost, ldapport )) == NULL ) {
-       perror( "ldap_init" );
-       return( EXIT_FAILURE );
-    }
+       if ( authzid || manageDSAit || noop )
+               tool_server_controls( ld, NULL, 0 );
 
-       {
-               /* this seems prudent */
-               int deref = LDAP_DEREF_NEVER;
-               ldap_set_option( ld, LDAP_OPT_DEREF, &deref );
-       }
+       retval = rc = 0;
 
-       /* don't chase referrals */
-       ldap_set_option( ld, LDAP_OPT_REFERRALS, LDAP_OPT_OFF );
+    if ( fp == NULL ) {
+               for ( ; optind < argc; ++optind ) {
+                       rc = dodelete( ld, argv[ optind ] );
 
-       if (version != -1 &&
-               ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ) != LDAP_OPT_SUCCESS)
-       {
-               fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n", version );
+                       /* Stop on error and no -c option */
+                       if( rc != 0 ) {
+                               retval = rc;
+                               if( contoper == 0 ) break;
+                       }
+               }
+       } else {
+               while ((rc == 0 || contoper) && fgets(buf, sizeof(buf), fp) != NULL) {
+                       buf[ strlen( buf ) - 1 ] = '\0'; /* remove trailing newline */
+
+                       if ( *buf != '\0' ) {
+                               rc = dodelete( ld, buf );
+                               if ( rc != 0 )
+                                       retval = rc;
+                       }
+               }
        }
 
-       if (want_bindpw)
-               passwd = getpass("Enter LDAP Password: ");
-
-    if ( ldap_bind_s( ld, binddn, passwd, authmethod ) != LDAP_SUCCESS ) {
-       ldap_perror( ld, "ldap_bind" );
-       return( EXIT_FAILURE );
-    }
+    ldap_unbind( ld );
 
-       if ( manageDSAit ) {
-               int err;
-               LDAPControl c;
-               LDAPControl *ctrls[2];
-               ctrls[0] = &c;
-               ctrls[1] = NULL;
+    return( retval );
+}
 
-               c.ldctl_oid = LDAP_CONTROL_MANAGEDSAIT;
-               c.ldctl_value.bv_val = NULL;
-               c.ldctl_value.bv_len = 0;
-               c.ldctl_iscritical = manageDSAit > 1;
 
-               err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, &ctrls );
+static int dodelete(
+    LDAP       *ld,
+    const char *dn)
+{
+       int id;
+       int     rc, code;
+       char *matcheddn = NULL, *text = NULL, **refs = NULL;
+       LDAPMessage *res;
+
+       if ( verbose ) {
+               printf( "%sdeleting entry \"%s\"\n",
+                       (not ? "!" : ""), dn );
+       }
 
-               if( err != LDAP_OPT_SUCCESS ) {
-                       fprintf( stderr, "Could not set Manage DSA IT Control\n" );
-                       if( c.ldctl_iscritical ) {
-                               exit( EXIT_FAILURE );
-                       }
-               }
+       if ( not ) {
+               return LDAP_SUCCESS;
        }
 
-       rc = 0;
-    if ( fp == NULL ) {
-       for ( ; optind < argc; ++optind ) {
-           rc = dodelete( ld, argv[ optind ] );
+       /* If prune is on, remove a whole subtree.  Delete the children of the
+        * DN recursively, then the DN requested.
+        */
+       if ( prune ) deletechildren( ld, dn );
+
+       rc = ldap_delete_ext( ld, dn, NULL, NULL, &id );
+       if ( rc != LDAP_SUCCESS ) {
+               fprintf( stderr, "%s: ldap_delete_ext: %s (%d)\n",
+                       prog, ldap_err2string( rc ), rc );
+               return rc;
        }
-    } else {
-       while ((rc == 0 || contoper) && fgets(buf, sizeof(buf), fp) != NULL) {
-           buf[ strlen( buf ) - 1 ] = '\0';    /* remove trailing newline */
-           if ( *buf != '\0' ) {
-               rc = dodelete( ld, buf );
-           }
+
+       rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, NULL, &res );
+       if ( rc < 0 ) {
+               ldap_perror( ld, "ldapdelete: ldap_result" );
+               return rc;
        }
-    }
 
-    ldap_unbind( ld );
+       rc = ldap_parse_result( ld, res, &code, &matcheddn, &text, &refs, NULL, 1 );
 
-       return( rc );
-}
+       if( rc != LDAP_SUCCESS ) {
+               fprintf( stderr, "%s: ldap_parse_result: %s (%d)\n",
+                       prog, ldap_err2string( rc ), rc );
+               return rc;
+       }
 
+       if( verbose || code != LDAP_SUCCESS ||
+               (matcheddn && *matcheddn) || (text && *text) || (refs && *refs) )
+       {
+               printf( "Delete Result: %s (%d)\n", ldap_err2string( code ), code );
 
-static int dodelete(
-    LDAP       *ld,
-    char       *dn)
-{
-    int        rc;
+               if( text && *text ) {
+                       printf( "Additional info: %s\n", text );
+               }
 
-    if ( verbose ) {
-       printf( "%sdeleting entry \"%s\"\n",
-               (not ? "!" : ""), dn );
-    }
-    if ( not ) {
-       rc = LDAP_SUCCESS;
-    } else {
-               /* If prune is on, remove a whole subtree.  Delete the children of the
-                * DN recursively, then the DN requested.
-                */
-               if ( prune ) deletechildren( ld, dn );
-               if (( rc = ldap_delete_s( ld, dn )) != LDAP_SUCCESS ) {
-                       ldap_perror( ld, "ldap_delete" );
-       } else if ( verbose ) {
-           printf( "\tremoved\n" );
+               if( matcheddn && *matcheddn ) {
+                       printf( "Matched DN: %s\n", matcheddn );
+               }
+
+               if( refs ) {
+                       int i;
+                       for( i=0; refs[i]; i++ ) {
+                               printf("Referral: %s\n", refs[i] );
+                       }
+               }
        }
-    }
 
-    return( rc );
+       ber_memfree( text );
+       ber_memfree( matcheddn );
+       ber_memvfree( (void **) refs );
+
+       return code;
 }
 
 /*
  * Delete all the children of an entry recursively until leaf nodes are reached.
  *
  */
-static int deletechildren( LDAP *ld,
-                           char *dn )
+static int deletechildren(
+       LDAP *ld,
+       const char *dn )
 {
-    LDAPMessage *res, *e;
-    int entries;
-    int rc;
-       int timeout = 30 * 10000;
-
-    ldap_set_option( ld, LDAP_OPT_TIMEOUT, &timeout );
-    if ( verbose ) printf ( "deleting children of: %s\n", dn );
-    /*
-     * Do a one level search at dn for children.  For each, delete its children.
-     */
-    if ( ldap_search_s( ld, dn, LDAP_SCOPE_ONELEVEL, "(objectclass=*)", NULL, 0, &res ) == -1 )
-    {
-        ldap_perror( ld, "ldap_search" );
-               ldap_get_option( ld, LDAP_OPT_ERROR_NUMBER, &rc );
-        return( rc );
-    }
+       LDAPMessage *res, *e;
+       int entries;
+       int rc;
+       static char *attrs[] = { "1.1", NULL };
+
+       if ( verbose ) printf ( "deleting children of: %s\n", dn );
+       /*
+        * Do a one level search at dn for children.  For each, delete its children.
+        */
+
+       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" );
+               return( rc );
+       }
 
-    entries = ldap_count_entries( ld, res );
-    if ( entries > 0 )
-    {
-        int i;
-
-        for (e = ldap_first_entry( ld, res ), i = 0; e != NULL;
-             e = ldap_next_entry( ld, e ), i++ )
-        {
-            if ( (rc = deletechildren( ld, ldap_get_dn( ld, e) )) == -1 )
-            {
-                ldap_perror( ld, "ldap_prune" );
-                return rc;
-            }
-            if ( verbose )
-            {
-                printf( "\tremoving %s\n", ldap_get_dn( ld, e ) );
-            }
-            if ( rc = ldap_delete_s( ld, ldap_get_dn( ld, e ) ) == -1 )
-            {
-                ldap_perror( ld, "ldap_delete" );
-                return rc;
-            }
-            else if ( verbose )
-            {
-                printf( "\t%s removed\n", ldap_get_dn( ld, e ) );
-            }
-        }
-    }
-    ldap_msgfree( res );
-    return rc;
+       entries = ldap_count_entries( ld, res );
+
+       if ( entries > 0 ) {
+               int i;
+
+               for (e = ldap_first_entry( ld, res ), i = 0; e != NULL;
+                       e = ldap_next_entry( ld, e ), i++ )
+               {
+                       char *dn = ldap_get_dn( ld, e );
+
+                       if( dn == NULL ) {
+                               ldap_perror( ld, "ldap_prune" );
+                               ldap_get_option( ld, LDAP_OPT_ERROR_NUMBER, &rc );
+                               ber_memfree( dn );
+                               return rc;
+                       }
+
+                       rc = deletechildren( ld, dn );
+                       if ( rc == -1 ) {
+                               ldap_perror( ld, "ldap_prune" );
+                               ber_memfree( dn );
+                               return rc;
+                       }
+
+                       if ( verbose ) {
+                               printf( "\tremoving %s\n", dn );
+                       }
+
+                       rc = ldap_delete_s( ld, dn );
+                       if ( rc == -1 ) {
+                               ldap_perror( ld, "ldap_delete" );
+                               ber_memfree( dn );
+                               return rc;
+
+                       }
+                       
+                       if ( verbose ) {
+                               printf( "\t%s removed\n", dn );
+                       }
+
+                       ber_memfree( dn );
+               }
+       }
+
+       ldap_msgfree( res );
+       return rc;
 }