Added lber_get/set_option. Removed lber_debug/ldap_debug.

[openldap] / clients / tools / ldapsearch.c

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index f6014767964a73340c30326bd2ba6dc42eacb552..7d6d118fd51bb2ed6521189b9912129ab5203be0 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -87,14 +87,15 @@ main( int argc, char **argv )
     char               *infile, *filtpattern, **attrs, line[ BUFSIZ ];
     FILE               *fp;
     int                        rc, i, first, scope, deref, attrsonly;
-    int                        referrals, timelimit, sizelimit, authmethod, want_bindpw;
+    int                        referrals, timelimit, sizelimit, debug;
+       int                     authmethod, want_bindpw;
     LDAP               *ld;
 
     infile = NULL;
     deref = verbose = allow_binary = not = vals2tmp =
            attrsonly = ldif = want_bindpw = 0;
     referrals = (int) LDAP_OPT_ON;
-    sizelimit = timelimit = 0;
+    sizelimit = timelimit = debug = 0;
     scope = LDAP_SCOPE_SUBTREE;
     authmethod = LDAP_AUTH_SIMPLE;
 
@@ -107,11 +108,7 @@ main( int argc, char **argv )
            ++verbose;
            break;
        case 'd':
-#ifdef LDAP_DEBUG
-           ldap_debug = lber_debug = atoi( optarg );   /* */
-#else /* LDAP_DEBUG */
-           fprintf( stderr, "compile with -DLDAP_DEBUG for debugging\n" );
-#endif /* LDAP_DEBUG */
+           debug |= atoi( optarg );
            break;
        case 'k':       /* use kerberos bind */
 #ifdef HAVE_KERBEROS
@@ -247,6 +244,12 @@ main( int argc, char **argv )
        printf( "ldap_open( %s, %d )\n", ldaphost, ldapport );
     }
 
+       if ( debug ) {
+               lber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug );
+               ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug );
+               ldif_debug = debug;
+       }
+
     if (( ld = ldap_open( ldaphost, ldapport )) == NULL ) {
        perror( ldaphost );
        exit( 1 );