]> git.sur5r.net Git - openldap/blobdiff - clients/ud/main.c
Don't depend error handling on exact resultCode.
[openldap] / clients / ud / main.c
index 93f5e1ae15da35313458d71af4b75d77839c4457..794b77d38cdda474e138a7b0ed5bffc7de3ac2ef 100644 (file)
@@ -1,3 +1,8 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1991, 1992, 1993 
  * Regents of the University of Michigan.  All rights reserved.
@@ -19,7 +24,9 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
+
 #include <setjmp.h>
 
 #ifdef HAVE_PWD_H
@@ -28,6 +35,7 @@
 
 #include <ac/signal.h>
 #include <ac/string.h>
+#include <ac/ctype.h>
 #include <ac/termios.h>
 #include <ac/time.h>
 #include <ac/unistd.h>
 #include <lber.h>
 #include <ldap.h>
 
-#include <ldapconfig.h>
+#include "ldap_defaults.h"
 #include "ud.h"
 
-#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1991, 1992, 1993 Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
-
 /*
  *  Used with change_base() to indicate which base we are changing.
  */
 #define BASE_SEARCH     0
 #define BASE_GROUPS     1
 
-#define        iscom(x)        (!strncasecmp(x, cmd, strlen(cmd)))
+#define        iscom(x)        (!strncasecmp((x), cmd, strlen(cmd)))
 
 static char *server = NULL;
 static char *config_file = UD_CONFIG_FILE;
 static char *filter_file = FILTERFILE;
-static int ldap_port = LDAP_PORT;
+static int ldap_port = 0;
 static int dereference = TRUE;
 
 char *default_bind_object = NULL;
@@ -80,16 +83,15 @@ LDAPFiltDesc *lfdp;         /* LDAP filter descriptor */
 #ifdef DEBUG
 int debug;                     /* debug flag */
 #endif
+int ldebug;                    /* library debug flag */
 
-extern void initialize_client();
-extern void initialize_attribute_strings();
+#ifndef HAVE_MKVERSION
+char Version[] = OPENLDAP_PACKAGE " " OPENLDAP_VERSION " UserDirectory (ud)";
+#endif
 
-main(argc, argv)
-int argc;
-char *argv[];
+int
+main( int argc, char **argv )
 {
-       extern char Version[];                  /* version number */
-       extern char *optarg;                    /* for parsing argv */
        register int c;                         /* for parsing argv */
        register char *cp;                      /* for parsing Version */
 
@@ -99,14 +101,11 @@ char *argv[];
        while ((c = getopt(argc, argv, "c:d:Df:l:p:s:u:vV")) != -1) {
                switch (c) {
                case 'l' :
-#ifdef LDAP_DEBUG
-                       ldap_debug = (int) strtol(optarg, (char **) NULL, 0);
-                       lber_debug = ldap_debug;
-#endif
+                       ldebug |= (int) strtol(optarg, (char **) NULL, 0);
                        break;
                case 'd' :
 #ifdef DEBUG
-                       debug = (int) strtol(optarg, (char **) NULL, 0);
+                       debug |= (int) strtol(optarg, (char **) NULL, 0);
 #endif
                        break;
                case 's' :
@@ -141,10 +140,10 @@ 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 */
                }
        }
@@ -156,26 +155,28 @@ char *argv[];
        printf(Version);
        fflush( stdout );
 
+#ifdef SIGPIPE
+       (void) SIGNAL (SIGPIPE, SIG_IGN);
+#endif
+
        initialize_client();
        initialize_attribute_strings();
 
        /* now tackle the user's commands */
        do_commands();
        /* NOTREACHED */
+
+       return 0;
 }
 
-do_commands()
+void
+do_commands( void )
 {
        LDAPMessage *mp;                        /* returned by find() */
        register char *cp;                      /* misc char pointer */
        register char *ap;                      /* misc char pointer */
-       static char buf[MED_BUF_SIZE];          /* for prompting */
        static char cmd[MED_BUF_SIZE];          /* holds the command */
        static char input[MED_BUF_SIZE];        /* buffer for input */
-       extern LDAPMessage *find();
-       extern void purge_group(), add_group(), remove_group(), x_group(),
-               tidy_up(), list_groups(), list_memberships(), edit();
-       extern char *nextstr();
 
 #ifdef DEBUG
        if (debug & D_TRACE)
@@ -197,19 +198,19 @@ do_commands()
                        putchar('\n');
                        continue;
                }
-               while (isspace(*cp))
+               while (isspace((unsigned char)*cp))
                        cp++;   
                ap = cmd;
                if (memset(cmd, '\0', sizeof(cmd)) == NULL)
                        fatal("memset");
-               while (!isspace(*cp) && (*cp != '\0'))
+               while (!isspace((unsigned char)*cp) && (*cp != '\0'))
                        *ap++ = *cp++;
                if (iscom("status"))
                        status();
                else if (iscom("stop") || iscom("quit"))
                        break;
                else if (iscom("cb") || iscom("cd") || iscom("moveto")) {
-                       while (isspace(*cp) && (*cp != '\0')) 
+                       while (isspace((unsigned char)*cp) && (*cp != '\0'))
                                cp++;
                        if (!strncasecmp(cp, "base", 4))
                                cp += 4;
@@ -279,30 +280,31 @@ do_commands()
        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 */
 }
 
-status()
+void
+status( void )
 {
-       void printbase();
        register char **rdns;
-       char *host;
 
 #ifdef DEBUG
        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 );
                }
        }
@@ -325,9 +327,8 @@ status()
        }
 }
 
-change_base(type, base, s)
-int type;
-char **base, *s;
+void
+change_base( int type, char **base, char *s )
 {
        register char *cp;                      /* utility pointers */
        char **rdns;                            /* for parsing */
@@ -341,13 +342,9 @@ char **base, *s;
        static char *choices[MED_BUF_SIZE];     /* bases from which to choose */
        static char resp[SMALL_BUF_SIZE];       /* for prompting user */
        static char buf[MED_BUF_SIZE];
-       void printbase();
        static char *attrs[] = { "objectClass", NULL };
        LDAPMessage *mp;                        /* results from a search */
        LDAPMessage *ep;                        /* for going thru bases */
-       extern char * friendly_name();
-       extern void StrFreeDup();
-       extern void Free();
 
 #ifdef DEBUG
        if (debug & D_TRACE)
@@ -356,7 +353,7 @@ char **base, *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");
@@ -370,6 +367,8 @@ char **base, *s;
                fetch_buffer(buf, sizeof(buf), stdin);
                if ((buf != NULL) && (buf[0] != '\0'))
                        s = buf;
+               else
+                       return;
        }
 
        /* set the output string */
@@ -411,7 +410,7 @@ char **base, *s;
                         *
                         *  sequence now that 'cp' is pointing to the '='.
                         */
-                       while(!isspace(*cp))
+                       while(!isspace((unsigned char)*cp))
                                cp--;
                        cp++;
                        /*
@@ -436,7 +435,7 @@ char **base, *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) ||
@@ -495,7 +494,7 @@ char **base, *s;
                        if (j == 0) {
                                (void) ldap_msgfree(mp);
                                for (i = 0; i < matches; i++)
-                                       Free(choices[i]);
+                                       ldap_memfree(choices[i]);
                                return;
                        }
                        if ((j < 1) || (j >= i))
@@ -505,7 +504,7 @@ char **base, *s;
                                printbase(output_string, *base);
                                (void) ldap_msgfree(mp);
                                for (i = 0; choices[i] != NULL; i++)
-                                       Free(choices[i]);
+                                       ldap_memfree(choices[i]);
                                return;
                        }
                }
@@ -544,28 +543,33 @@ char **base, *s;
        }
 }
 
-void initialize_client()
+void
+initialize_client( void )
 {
        FILE *fp;                               /* for config file */
        static char buffer[MED_BUF_SIZE];       /* for input */
+#ifdef HAVE_GETPWUID
        struct passwd *pw;                      /* for getting the home dir */
+#endif
        register char *cp;                      /* for fiddling with buffer */
-       char *term;                             /* for tty set-up */
        char *config;                           /* config file to use */
        static char bp[1024];                   /* for tty set-up */
-       extern RETSIGTYPE attn();                       /* ^C signal handler */
-       extern char *getenv();
-       extern void Free();
 
 #ifdef DEBUG
        if (debug & D_TRACE)
                printf("->initialize_client()\n");
 #endif
+
+       if (ldebug) {
+               ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &ldebug );
+               ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &ldebug );
+       }
+
        /*
         *  A per-user config file has precedence over any system-wide
         *  config file, if one exists.
         */
-#ifdef HAVE_GETPWUID_H
+#ifdef HAVE_GETPWUID
        if ((pw = getpwuid((uid_t) geteuid())) == (struct passwd *) NULL)
                config = config_file;
        else {
@@ -580,6 +584,8 @@ void initialize_client()
                                config = config_file;
                }
        }
+#else
+       config = config_file;
 #endif /* getpwduid() */
 #ifdef DEBUG
        if (debug & D_INITIALIZE)
@@ -603,7 +609,7 @@ void initialize_client()
                                if (server != NULL)
                                        continue;
                                cp = buffer + 6;
-                               while (isspace(*cp))
+                               while (isspace((unsigned char)*cp))
                                        cp++;
                                if ((*cp == '\0') || (*cp == '\n'))
                                        continue;
@@ -613,7 +619,7 @@ void initialize_client()
                                if (server != NULL)
                                        continue;
                                cp = buffer + 4;
-                               while (isspace(*cp))
+                               while (isspace((unsigned char)*cp))
                                        cp++;
                                if ((*cp == '\0') || (*cp == '\n'))
                                        continue;
@@ -621,7 +627,7 @@ void initialize_client()
                        }
                        else if (!strncasecmp(buffer, "base", 4)) {
                                cp = buffer + 4;
-                               while (isspace(*cp))
+                               while (isspace((unsigned char)*cp))
                                        cp++;
                                if ((*cp == '\0') || (*cp == '\n'))
                                        continue;
@@ -629,7 +635,7 @@ void initialize_client()
                        }
                        else if (!strncasecmp(buffer, "groupbase", 9)) {
                                cp = buffer + 9;
-                               while (isspace(*cp))
+                               while (isspace((unsigned char)*cp))
                                        cp++;
                                if ((*cp == '\0') || (*cp == '\n'))
                                        continue;
@@ -647,20 +653,15 @@ void initialize_client()
         *  are meaningless since we will immediately be doing a null bind
         *  because we want to be sure to use TCP, not UDP.
         */
-       if ((ld = ldap_open(server, ldap_port)) == NULL) {
-               fprintf(stderr, "  The LDAP Directory is temporarily unavailable.  Please try again later.\n");
-               exit(0);
+       if ((ld = ldap_init(server, ldap_port)) == NULL) {
+               fprintf(stderr, "  Initialization of LDAP session failed.\n");
+               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 */
        }
        {
@@ -692,19 +693,14 @@ void initialize_client()
 
 #ifndef NO_TERMCAP
        {
-       struct winsize win;                     /* for tty set-up */
-       extern RETSIGTYPE chwinsz();            /* WINSZ signal handler */
+       char *term;
 
        if (((term = getenv("TERM")) == NULL) || (tgetent(bp, term) <= 0))
                return;
        else {
 #ifdef TIOCGWINSZ
-               if (ioctl(fileno(stdout), TIOCGWINSZ, &win) < 0) {
-                       lpp = tgetnum("li");
-                       col_size = tgetnum("co");
-               } else
-#endif
-               {
+               struct winsize win;             /* for tty set-up */
+               if (ioctl(fileno(stdout), TIOCGWINSZ, &win) >= 0) {
                        if ((lpp = win.ws_row) == 0)
                                lpp = tgetnum("li");
                        if ((col_size = win.ws_col) == 0)
@@ -713,15 +709,20 @@ void initialize_client()
                                lpp = DEFAULT_TTY_HEIGHT;
                        if ((col_size <= 0) || tgetflag("hc"))
                                col_size = DEFAULT_TTY_WIDTH;
+                       (void) SIGNAL (SIGWINCH, chwinsz);
+               } else
+#endif
+               {
+                       lpp = tgetnum("li");
+                       col_size = tgetnum("co");
                }
        }
-       (void) SIGNAL (SIGWINCH, chwinsz);
-
        }
 #endif
 }
 
-RETSIGTYPE attn()
+RETSIGTYPE
+attn( int sig )
 {
        fflush(stderr);
        fflush(stdout);
@@ -732,8 +733,9 @@ RETSIGTYPE attn()
        longjmp(env, 1);
 }
 
-#ifndef NO_TERMCAP
-RETSIGTYPE chwinsz() 
+#if !defined(NO_TERMCAP) && defined(TIOCGWINSZ)
+RETSIGTYPE
+chwinsz( int sig )
 {
        struct winsize win;