Don't reeval expression

[openldap] / servers / slapd / tools / slapindex.c

diff --git a/servers/slapd/tools/slapindex.c b/servers/slapd/tools/slapindex.c
index a41af24b359710f4eae6f63ae8e3406e8e495c2e..33b04dadd0c60c96e635940f0feb275abcc5431b 100644 (file)
--- a/servers/slapd/tools/slapindex.c
+++ b/servers/slapd/tools/slapindex.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 #include "portable.h"
@@ -19,18 +19,15 @@
 int
 main( int argc, char **argv )
 {
-       char            *type;
-       AttributeDescription *desc;
-       const char *text;
        ID id;
        int rc = EXIT_SUCCESS;
 
        slap_tool_init( "slapindex", SLAPINDEX, argc, argv );
 
-       if( !be->be_entry_open &&
-               !be->be_entry_close &&
-               !be->be_entry_first &&
-               !be->be_entry_next &&
+       if( !be->be_entry_open ||
+               !be->be_entry_close ||
+               !be->be_entry_first ||
+               !be->be_entry_next  ||
                !be->be_entry_reindex )
        {
                fprintf( stderr, "%s: database doesn't support necessary operations.\n",
@@ -38,16 +35,6 @@ main( int argc, char **argv )
                exit( EXIT_FAILURE );
        }
 
-       type = argv[argc - 1];
-
-       rc = slap_str2ad( type, &desc, &text );
-
-       if( rc != LDAP_SUCCESS ) {
-               fprintf( stderr, "%s: unrecognized attribute type: %s\n",
-                       progname, text );
-               exit( EXIT_FAILURE );
-       }
-
        if( be->be_entry_open( be, 0 ) != 0 ) {
                fprintf( stderr, "%s: could not open database.\n",
                        progname );
@@ -76,6 +63,5 @@ main( int argc, char **argv )
        (void) be->be_entry_close( be );
 
        slap_tool_destroy();
-
        return( rc );
 }