Don't depend error handling on exact resultCode.

[openldap] / clients / ud / main.c

diff --git a/clients/ud/main.c b/clients/ud/main.c
index a4d742bbeed0652e609e8d22a21f01d53a8c7c58..794b77d38cdda474e138a7b0ed5bffc7de3ac2ef 100644 (file)
--- a/clients/ud/main.c
+++ b/clients/ud/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -46,7 +47,7 @@
 #include <lber.h>
 #include <ldap.h>
 
-#include <ldapconfig.h>
+#include "ldap_defaults.h"
 #include "ud.h"
 
 /*
@@ -139,10 +140,10 @@ main( int argc, char **argv )
                        printf("   64  authentication information\n");
                        printf("  128  initialization information\n\n");
                        format("These are masks, and may be added to form multiple debug levels.  For example, '-d 35' would perform a function trace, print out information about the find() function, and would print out information about the output routines too.", 75, 2);
-                       exit(0);
+                       exit( EXIT_SUCCESS );
                default:
                        fprintf(stderr, "Usage: %s [-c filter-config-file] [-d debug-level] [-l ldap-debug-level] [-s server] [-p port] [-V]\n", argv[0]);
-                       exit(-1);
+                       exit( EXIT_FAILURE);
                        /* NOTREACHED */
                }
        }
@@ -279,10 +280,10 @@ do_commands( void )
        printf(" Thank you!\n");
        
        ldap_unbind(ld);
-#ifdef HAVE_KERBEROS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
        destroy_tickets();
 #endif
-       exit(0);
+       exit( EXIT_SUCCESS );
        /* NOTREACHED */
 }
 
@@ -295,13 +296,15 @@ status( void )
        if (debug & D_TRACE)
                printf("->status()\n");
 #endif
-       printf("  Current server is %s", server);
+       printf("  Current server is %s", server != NULL ? server : "<default>" );
        if ( ld != NULL ) {
                char *host = NULL;
                
                ldap_get_option(ld, LDAP_OPT_HOST_NAME, &host);
 
-               if (( host != NULL ) && (strcasecmp( host, server ) != 0 )) {
+               if ( host != NULL &&
+                       ( server == NULL || strcasecmp( host, server ) != 0 ) )
+               {
                        printf( " (%s)", host );
                }
        }
@@ -350,7 +353,7 @@ change_base( int type, char **base, char *s )
        /*
         *  If s is NULL we need to prompt the user for an argument.
         */
-       while (s == NULL) {
+       if (s == NULL) {
                if (verbose) {
                        printf("  You need to specify how the base is to be changed.  Valid choices are:\n");
                        printf("     ?       - list the choices immediately below this level\n");
@@ -364,6 +367,8 @@ change_base( int type, char **base, char *s )
                fetch_buffer(buf, sizeof(buf), stdin);
                if ((buf != NULL) && (buf[0] != '\0'))
                        s = buf;
+               else
+                       return;
        }
 
        /* set the output string */
@@ -430,7 +435,7 @@ change_base( int type, char **base, char *s )
                 *  the user if they want to see more.  They can also just
                 *  type a number at that point too.
                 */
-               if (ldap_search_s(ld, *base, LDAP_SCOPE_ONELEVEL, "(|(objectClass=quipuNonLeafObject)(objectClass=externalNonLeafObject))", attrs, FALSE, &mp) != LDAP_SUCCESS) {
+               if (ldap_search_s(ld, *base, LDAP_SCOPE_ONELEVEL, NULL, attrs, FALSE, &mp) != LDAP_SUCCESS) {
                        int ld_errno = 0;
                        ldap_get_option(ld, LDAP_OPT_ERROR_NUMBER, &ld_errno);
                        if ((ld_errno == LDAP_TIMELIMIT_EXCEEDED) ||
@@ -556,8 +561,8 @@ initialize_client( void )
 #endif
 
        if (ldebug) {
-               ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &ldebug);
-               ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &ldebug);
+               ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &ldebug );
+               ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &ldebug );
        }
 
        /*
@@ -650,18 +655,13 @@ initialize_client( void )
         */
        if ((ld = ldap_init(server, ldap_port)) == NULL) {
                fprintf(stderr, "  Initialization of LDAP session failed.\n");
-               exit(0);
+               exit( EXIT_FAILURE );
                /* NOTREACHED */
        }
        if (ldap_bind_s(ld, (char *) default_bind_object, NULL,
            LDAP_AUTH_SIMPLE) != LDAP_SUCCESS) {
-               int ld_errno = 0;
-               ldap_get_option(ld, LDAP_OPT_ERROR_NUMBER, &ld_errno);
-
-               fprintf(stderr, "  The LDAP Directory is temporarily unavailable.  Please try again later.\n");
-               if (ld_errno != LDAP_UNAVAILABLE)
-                       ldap_perror(ld, "  ldap_bind_s");
-               exit(0);
+               ldap_perror(ld, "  ldap_bind_s");
+               exit( EXIT_FAILURE );
                /* NOTREACHED */
        }
        {