]> git.sur5r.net Git - openldap/blobdiff - clients/ud/find.c
From jon@symas.com - patches for consistent use of directory separators
[openldap] / clients / ud / find.c
index 90c449c05607b2fdde8a30dc62922205f5df9ac2..d5b85e9c21757f9b239111db9ccb73db00640287 100644 (file)
@@ -1,3 +1,8 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 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.
 
 #include <stdio.h>
 
+#include <ac/stdlib.h>
+
 #include <ac/ctype.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include <lber.h>
 #include <ldap.h>
 
 #include "ud.h"
 
-extern char *search_base;      /* search base */
-extern int verbose;            /* verbose mode flag */
-extern LDAP *ld;               /* our ldap descriptor */
-       
 static int num_picked = 0;     /* used when user picks entry at More prompt */
 
-#ifdef DEBUG
-extern int debug;              /* debug flag */
-#endif
 
-vrfy(dn)
-char *dn;
+int
+vrfy( char *dn )
 {
-       LDAPMessage *results;
-       static char *attrs[2] = { "objectClass", NULL };
+       LDAPMessage *results = NULL;
+       static char *attrs[2] = { "1.1", NULL };
        int ld_errno = 0;
 
 #ifdef DEBUG
@@ -45,7 +44,7 @@ char *dn;
                printf("->vrfy(%s)\n", dn);
 #endif
        /* verify that this DN exists in the directory */
-       (void) ldap_search_s(ld, dn, LDAP_SCOPE_BASE, "objectClass=*", attrs, TRUE, &results);
+       (void) ldap_search_s(ld, dn, LDAP_SCOPE_BASE, NULL, attrs, TRUE, &results);
        (void) ldap_msgfree(results);
 
        ldap_get_option(ld, LDAP_OPT_ERROR_NUMBER, &ld_errno);
@@ -61,20 +60,16 @@ char *dn;
 }
        
 
-static LDAPMessage * disambiguate( result, matches, read_attrs, who )
-LDAPMessage *result;
-int matches;
-char **read_attrs;
-char *who;
+static LDAPMessage *
+disambiguate( LDAPMessage *result, int matches, char **read_attrs, char *who )
 {
        int choice;                     /* entry that user chooses */
        int i;
        char *namelist[MAX_NUM_NAMES];  /* names found */
        char response[SMALL_BUF_SIZE];  /* results from user */
        char *name = NULL;              /* DN to lookup */
-       LDAPMessage *mp;
+       LDAPMessage *mp = NULL;
        int ld_errno = 0;
-       extern void Free();
 
 #ifdef DEBUG
        if (debug & D_TRACE)
@@ -100,7 +95,7 @@ char *who;
        for (;;) {
                printf("  Do you wish to see a list of names? ");
                fflush(stdout);
-               (void) memset(response, 0, sizeof(response));
+               (void) memset(response, '\0', sizeof(response));
                fetch_buffer(response, sizeof(response), stdin);
                switch (response[0]) {
                case 'n' :
@@ -137,7 +132,7 @@ char *who;
                                printf("     ld = 0x%x\n", ld);
                                printf("     search base = %s\n", name);
                                printf("     scope = LDAP_SCOPE_BASE\n");
-                               printf("     filter = objectClass=*\n");
+                               printf("     filter = (objectClass=*)\n");
                                for (i = 0; read_attrs[i] != NULL; i++)
                                        printf("     read_attrs[%d] = %s\n", i, read_attrs[i]);
                                printf("     read_attrs[%d] = NULL\n", i);
@@ -145,7 +140,7 @@ char *who;
                                printf("     &mp = 0x%x\n", &mp);
                        }
 #endif
-                       if (ldap_search_s(ld, name, LDAP_SCOPE_BASE, "objectClass=*", read_attrs, FALSE, &mp) != LDAP_SUCCESS) {
+                       if (ldap_search_s(ld, name, LDAP_SCOPE_BASE, NULL, read_attrs, FALSE, &mp) != LDAP_SUCCESS) {
                                ldap_perror(ld, "ldap_search_s");
                                Free(name);
                                ldap_msgfree(mp);
@@ -161,9 +156,8 @@ char *who;
        }
 }
 
-LDAPMessage * find(who, quiet)
-char *who;
-int quiet;
+LDAPMessage *
+find( char *who, int quiet )
 {
        register int i, j, k;           /* general ints */
        int matches;                    /* from ldap_count_entries() */
@@ -177,9 +171,6 @@ int quiet;
        char response[SMALL_BUF_SIZE];
        char *cp, *dn, **rdns;
        LDAPFiltInfo *fi;
-       extern LDAPFiltDesc *lfdp;              /* LDAP filter descriptor */
-       extern struct attribute attrlist[];     /* complete list of attrs */
-       extern void Free();
 
 #ifdef DEBUG
        if (debug & D_TRACE)
@@ -208,50 +199,6 @@ int quiet;
                search_attrs[k] = NULL;
        }
 
-       /*
-        *  If the user-supplied name has any commas in it, we
-        *  assume that it is a UFN, and do everything right
-        *  here.  If we don't find it, treat it as NOT a UFN.
-        */
-       if (strchr(who, ',') != NULL) {
-               int     savederef, deref;
-#ifdef DEBUG
-               if (debug & D_FIND)
-                       printf("\"%s\" appears to be a UFN\n", who);
-#endif
-               ldap_get_option(ld, LDAP_OPT_DEREF, &savederef);
-               deref = LDAP_DEREF_FINDING;
-               ldap_set_option(ld, LDAP_OPT_DEREF, &deref);
-
-               if ((rc = ldap_ufn_search_s(ld, who, search_attrs, FALSE, &res)) !=
-                   LDAP_SUCCESS && rc != LDAP_SIZELIMIT_EXCEEDED &&
-                   rc != LDAP_TIMELIMIT_EXCEEDED) {
-                       ldap_perror(ld, "ldap_ufn_search_s");
-                       ldap_set_option(ld, LDAP_OPT_DEREF, &savederef);
-                       return(NULL);
-               }
-               if ((matches = ldap_count_entries(ld, res)) < 0) {
-                       ldap_perror(ld, "ldap_count_entries");
-                       ldap_set_option(ld, LDAP_OPT_DEREF, &savederef);
-                       return(NULL);
-               } else if (matches == 1) {
-                       if (ldap_search_s(ld, ldap_get_dn(ld, ldap_first_entry(ld, res)), LDAP_SCOPE_BASE, "objectClass=*", read_attrs, FALSE, &res) != LDAP_SUCCESS) {
-                               int ld_errno = 0;
-                               ldap_get_option(ld, LDAP_OPT_ERROR_NUMBER, &ld_errno);
-                               if (ld_errno == LDAP_UNAVAILABLE)
-                                       printf("  Could not contact the LDAP server to find \"%s\".\n", who);
-                               else
-                                       ldap_perror(ld, "ldap_search_s");
-                               return(NULL);
-                       }
-                       ldap_set_option(ld, LDAP_OPT_DEREF, &savederef);
-                       return(res);
-               } else if (matches > 1 ) {
-                       return disambiguate( res, matches, read_attrs, who );
-               }
-               ldap_set_option(ld, LDAP_OPT_DEREF, &savederef);
-       }
-
        /*
         *  Old users of the MTS *USERDIRECTORY will likely wrap the name
         *  in quotes.  Not only is this unnecessary, but it also won't work.
@@ -266,9 +213,6 @@ int quiet;
                        break;
        }
 
-       /*
-        *  It wasn't a UFN, so look it up in the usual method.
-        */
        for (fi = ldap_getfirstfilter(lfdp, "ud", who); fi != NULL;
             fi = ldap_getnextfilter(lfdp)) {
 #ifdef DEBUG
@@ -301,7 +245,10 @@ int quiet;
                                fflush(stdout);
                                fetch_buffer(response, sizeof(response), stdin);
                                if ((response[0] == 'n') || (response[0] == 'N'))
+                               {
+                                       ldap_memfree(dn);
                                        return(NULL);
+                               }
                        }
 #ifdef DEBUG
                        if (debug & D_FIND) {
@@ -309,7 +256,7 @@ int quiet;
                                printf("     ld = 0x%x\n", ld);
                                printf("     dn = %s\n", dn);
                                printf("     scope = LDAP_SCOPE_BASE\n");
-                               printf("     filter = %s\n", "objectClass=*");
+                               printf("     filter = %s\n", "(objectClass=*)");
                                for (i = 0; read_attrs[i] != NULL; i++)
                                        printf("     read_attrs[%d] = %s\n", i, read_attrs[i]);
                                printf("     read_attrs[%d] = NULL\n", i);
@@ -317,12 +264,12 @@ int quiet;
                                printf("     &results = 0x%x\n", &res);
                        }
 #endif
-                       if (ldap_search_s(ld, dn, LDAP_SCOPE_BASE, "objectClass=*", read_attrs, FALSE, &res) != LDAP_SUCCESS) {
+                       if (ldap_search_s(ld, dn, LDAP_SCOPE_BASE, NULL, read_attrs, FALSE, &res) != LDAP_SUCCESS) {
                                ldap_perror(ld, "ldap_search_s");
                                ldap_msgfree(res);
-                               return(NULL);
+                               res = NULL;
                        }
-                       Free(dn);
+                       ldap_memfree(dn);
                        return(res);
                }
                else if (matches > 0) {
@@ -336,8 +283,8 @@ int quiet;
        return(NULL);
 }
 
-pick_one(i)
-int i;
+int
+pick_one( int i )
 {
        int n;
        char user_pick[SMALL_BUF_SIZE];
@@ -362,13 +309,10 @@ int i;
        /* NOTREACHED */
 }
 
-print_list(list, names, matches)
-LDAPMessage *list;
-char *names[];
-int *matches;
+void
+print_list( LDAPMessage *list, char **names, int *matches )
 {
        char **rdns, **cpp;
-       extern int lpp;
        char resp[SMALL_BUF_SIZE];
        register LDAPMessage *ep;
        register int i = 1;
@@ -412,9 +356,8 @@ again:
        return;
 }
 
-find_all_subscribers(sub, group)
-char *sub[];
-char *group;
+int
+find_all_subscribers( char **sub, char *group )
 {
        int count;
        LDAPMessage *result;
@@ -459,9 +402,8 @@ char *group;
        return(count);
 }
 
-char * fetch_boolean_value(who, attr)
-char *who;
-struct attribute attr;
+char *
+fetch_boolean_value( char *who, struct attribute attr )
 {
        LDAPMessage *result;            /* from the search below */
        register LDAPMessage *ep;       /* entry pointer */
@@ -473,7 +415,7 @@ struct attribute attr;
                printf("->fetch_boolean_value(%s, %s)\n", who, attr.quipu_name);
 #endif
        attributes[0] = attr.quipu_name;
-       if (ldap_search_s(ld, who, LDAP_SCOPE_BASE, "objectClass=*", attributes, FALSE, &result) != LDAP_SUCCESS) {
+       if (ldap_search_s(ld, who, LDAP_SCOPE_BASE, NULL, attributes, FALSE, &result) != LDAP_SUCCESS) {
                int ld_errno = 0;
                ldap_get_option(ld, LDAP_OPT_ERROR_NUMBER, &ld_errno);
                if (ld_errno == LDAP_NO_SUCH_ATTRIBUTE)