From: Hallvard Furuseth Date: Sun, 8 Nov 1998 01:16:36 +0000 (+0000) Subject: Removed bad LDAP* argument to disambiguate() X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~1163 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3bc58b5eecec208e453041a4c7ae0c7863c2d9c0;p=openldap Removed bad LDAP* argument to disambiguate() --- diff --git a/clients/ud/find.c b/clients/ud/find.c index 334ce9db90..9fe2442f0b 100644 --- a/clients/ud/find.c +++ b/clients/ud/find.c @@ -13,6 +13,7 @@ #include "portable.h" #include +#include /* get atoi() */ #include #include @@ -23,18 +24,11 @@ #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 }; @@ -61,11 +55,8 @@ 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; @@ -74,7 +65,6 @@ char *who; char *name = NULL; /* DN to lookup */ LDAPMessage *mp; int ld_errno = 0; - extern void Free(); #ifdef DEBUG if (debug & D_TRACE) @@ -161,9 +151,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 +166,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) @@ -247,8 +233,7 @@ int quiet; ldap_set_option(ld, LDAP_OPT_DEREF, &savederef); return(res); } else if (matches > 1 ) { - return( disambiguate( ld, res, matches, read_attrs, - who ) ); + return disambiguate( res, matches, read_attrs, who ); } ldap_set_option(ld, LDAP_OPT_DEREF, &savederef); } @@ -337,8 +322,8 @@ int quiet; return(NULL); } -pick_one(i) -int i; +int +pick_one( int i ) { int n; char user_pick[SMALL_BUF_SIZE]; @@ -363,13 +348,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; @@ -410,12 +392,10 @@ again: } *matches = i - 1; names[i] = NULL; - return; } -find_all_subscribers(sub, group) -char *sub[]; -char *group; +int +find_all_subscribers( char *sub[], char *group ) { int count; LDAPMessage *result; @@ -460,9 +440,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 */