mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-18 11:05:48 +08:00
Trim finger from HEAD
This commit is contained in:
Kurt Zeilenga
parent
c7d183a19b
commit
bf662a8cd1
@ -129,7 +129,6 @@ SED = sed
|
||||
|
||||
# Misc UNIX commands used in programs
|
||||
EDITOR = @EDITOR@
|
||||
FINGER = @FINGER@
|
||||
SENDMAIL = @SENDMAIL@
|
||||
|
||||
# For manual pages
|
||||
|
||||
@ -5,5 +5,5 @@
|
||||
## Clients Makefile.in for OpenLDAP
|
||||
|
||||
SUBDIRS = tools ud
|
||||
CLEANDIRS = finger mail500 maildap
|
||||
CLEANDIRS = mail500 maildap
|
||||
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
# $OpenLDAP$
|
||||
|
||||
SRCS= main.c
|
||||
XSRCS= version.c
|
||||
OBJS= main.o
|
||||
|
||||
UNIX_PRGS = in.xfingerd
|
||||
PROGRAMS = $(@PLAT@_PRGS)
|
||||
|
||||
LDAP_INCDIR= ../../include
|
||||
LDAP_LIBDIR= ../../libraries
|
||||
|
||||
XLIBS = $(LDAP_L)
|
||||
XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
|
||||
|
||||
in.xfingerd : version.o
|
||||
$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)
|
||||
|
||||
version.c: $(OBJS) $(XLIBS)
|
||||
@-$(RM) $@
|
||||
$(MKVERSION) in.xfingerd > $@
|
||||
|
||||
install-local: $(PROGRAMS) FORCE
|
||||
-$(MKDIR) $(DESTDIR)$(libexecdir)
|
||||
@( \
|
||||
for prg in $(PROGRAMS); do \
|
||||
$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 $$prg$(EXEEXT) \
|
||||
$(DESTDIR)$(libexecdir); \
|
||||
done \
|
||||
)
|
||||
|
||||
@ -1,421 +0,0 @@
|
||||
/* $OpenLDAP$ */
|
||||
/*
|
||||
* Copyright (c) 1990,1994 Regents of the University of Michigan.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms are permitted
|
||||
* provided that this notice is preserved and that due credit is given
|
||||
* to the University of Michigan at Ann Arbor. The name of the University
|
||||
* may not be used to endorse or promote products derived from this
|
||||
* software without specific prior written permission. This software
|
||||
* is provided ``as is'' without express or implied warranty.
|
||||
*/
|
||||
|
||||
#include "portable.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include <ac/stdlib.h>
|
||||
|
||||
#include <ac/ctype.h>
|
||||
#include <ac/signal.h>
|
||||
#include <ac/socket.h>
|
||||
#include <ac/string.h>
|
||||
#include <ac/syslog.h>
|
||||
#include <ac/time.h>
|
||||
#include <ac/unistd.h>
|
||||
#include <ac/wait.h>
|
||||
|
||||
#ifdef HAVE_SYS_RESOURCE_H
|
||||
#include <sys/resource.h>
|
||||
#endif
|
||||
|
||||
#include <ldap.h>
|
||||
#include <disptmpl.h>
|
||||
|
||||
#include "ldap_defaults.h"
|
||||
|
||||
|
||||
int dosyslog = 1;
|
||||
char *ldaphost = NULL;
|
||||
int ldapport = 0;
|
||||
char *base = NULL;
|
||||
int deref;
|
||||
char *filterfile = FILTERFILE;
|
||||
char *templatefile = TEMPLATEFILE;
|
||||
int rdncount = FINGER_RDNCOUNT;
|
||||
|
||||
static void do_query(void);
|
||||
static void do_search(LDAP *ld, char *buf);
|
||||
static void do_read(LDAP *ld, LDAPMessage *e);
|
||||
|
||||
static void
|
||||
usage( char *name )
|
||||
{
|
||||
fprintf( stderr, "usage: %s [-l] [-x ldaphost] [-p ldapport] [-b searchbase] [-f filterfile] [-t templatefile] [-c rdncount]\r\n", name );
|
||||
exit( EXIT_FAILURE );
|
||||
}
|
||||
|
||||
int
|
||||
main( int argc, char **argv )
|
||||
{
|
||||
int i;
|
||||
char *myname;
|
||||
struct hostent *hp;
|
||||
struct sockaddr_in peername;
|
||||
socklen_t peernamelen;
|
||||
int interactive = 0;
|
||||
|
||||
deref = FINGER_DEREF;
|
||||
while ( (i = getopt( argc, argv, "f:ilp:t:x:p:b:c:" )) != EOF ) {
|
||||
switch( i ) {
|
||||
case 'f': /* ldap filter file */
|
||||
filterfile = strdup( optarg );
|
||||
break;
|
||||
|
||||
case 'i': /* interactive */
|
||||
interactive = 1;
|
||||
break;
|
||||
|
||||
case 'l': /* don't do syslogging */
|
||||
dosyslog = 0;
|
||||
break;
|
||||
|
||||
case 't': /* ldap template file */
|
||||
templatefile = strdup( optarg );
|
||||
break;
|
||||
|
||||
case 'x': /* specify ldap host */
|
||||
ldaphost = strdup( optarg );
|
||||
break;
|
||||
|
||||
case 'p': /* specify ldap port */
|
||||
ldapport = atoi( optarg );
|
||||
break;
|
||||
|
||||
case 'b': /* specify search base */
|
||||
base = strdup( optarg );
|
||||
break;
|
||||
|
||||
case 'c': /* specify number of DN components to show */
|
||||
rdncount = atoi( optarg );
|
||||
break;
|
||||
|
||||
default:
|
||||
usage( argv[0] );
|
||||
}
|
||||
}
|
||||
|
||||
if ( !interactive ) {
|
||||
peernamelen = sizeof(peername);
|
||||
if ( getpeername( 0, (struct sockaddr *)&peername,
|
||||
&peernamelen ) != 0 ) {
|
||||
perror( "getpeername" );
|
||||
exit( EXIT_FAILURE );
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef FINGER_BANNER
|
||||
if ( FINGER_BANNER != NULL && strcmp( FINGER_BANNER, "" ) != 0 ) {
|
||||
printf( FINGER_BANNER );
|
||||
fflush( stdout );
|
||||
}
|
||||
#endif
|
||||
|
||||
if ( (myname = strrchr( argv[0], *LDAP_DIRSEP )) == NULL )
|
||||
myname = strdup( argv[0] );
|
||||
else
|
||||
myname = strdup( myname + 1 );
|
||||
|
||||
#ifdef SIGPIPE
|
||||
(void) SIGNAL( SIGPIPE, SIG_IGN );
|
||||
#endif
|
||||
|
||||
if ( dosyslog ) {
|
||||
#ifdef LOG_LOCAL4
|
||||
openlog( myname, OPENLOG_OPTIONS, LOG_LOCAL4 );
|
||||
#elif LOG_DEBUG
|
||||
openlog( myname, OPENLOG_OPTIONS );
|
||||
#endif
|
||||
}
|
||||
|
||||
if ( dosyslog && !interactive ) {
|
||||
hp = gethostbyaddr( (char *) &peername.sin_addr,
|
||||
sizeof(peername.sin_addr), AF_INET );
|
||||
syslog( LOG_INFO, "connection from %s (%s)",
|
||||
(hp == NULL) ? "unknown" : hp->h_name,
|
||||
inet_ntoa( peername.sin_addr ) );
|
||||
}
|
||||
|
||||
do_query();
|
||||
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
static void
|
||||
do_query( void )
|
||||
{
|
||||
char buf[256];
|
||||
int len, rc, tblsize;
|
||||
struct timeval timeout;
|
||||
fd_set readfds;
|
||||
LDAP *ld;
|
||||
|
||||
if ( (ld = ldap_init( ldaphost, ldapport )) == NULL ) {
|
||||
fprintf( stderr, FINGER_UNAVAILABLE );
|
||||
perror( "ldap_init" );
|
||||
exit( EXIT_FAILURE );
|
||||
}
|
||||
|
||||
{
|
||||
int limit = FINGER_SIZELIMIT;
|
||||
ldap_set_option(ld, LDAP_OPT_SIZELIMIT, &limit);
|
||||
}
|
||||
ldap_set_option(ld, LDAP_OPT_DEREF, &deref);
|
||||
|
||||
if ( ldap_simple_bind_s( ld, NULL, NULL )
|
||||
!= LDAP_SUCCESS )
|
||||
{
|
||||
fprintf( stderr, FINGER_UNAVAILABLE );
|
||||
ldap_perror( ld, "ldap_simple_bind_s" );
|
||||
exit( EXIT_FAILURE );
|
||||
}
|
||||
|
||||
#ifdef HAVE_SYSCONF
|
||||
tblsize = sysconf( _SC_OPEN_MAX );
|
||||
#elif HAVE_GETDTABLESIZE
|
||||
tblsize = getdtablesize();
|
||||
#else
|
||||
tblsize = FD_SETSIZE;
|
||||
#endif
|
||||
|
||||
#ifdef FD_SETSIZE
|
||||
if (tblsize > FD_SETSIZE) {
|
||||
tblsize = FD_SETSIZE;
|
||||
}
|
||||
#endif /* FD_SETSIZE*/
|
||||
|
||||
timeout.tv_sec = FINGER_TIMEOUT;
|
||||
timeout.tv_usec = 0;
|
||||
FD_ZERO( &readfds );
|
||||
FD_SET( fileno( stdin ), &readfds );
|
||||
|
||||
if ( (rc = select( tblsize, &readfds, 0, 0, &timeout )) <= 0 ) {
|
||||
if ( rc < 0 )
|
||||
perror( "select" );
|
||||
else
|
||||
fprintf( stderr, "connection timed out on input\r\n" );
|
||||
exit( EXIT_FAILURE );
|
||||
}
|
||||
|
||||
if ( fgets( buf, sizeof(buf), stdin ) == NULL )
|
||||
exit( EXIT_FAILURE );
|
||||
|
||||
len = strlen( buf );
|
||||
|
||||
/* strip off \r \n */
|
||||
if ( buf[len - 1] == '\n' ) {
|
||||
buf[len - 1] = '\0';
|
||||
len--;
|
||||
}
|
||||
if ( buf[len - 1] == '\r' ) {
|
||||
buf[len - 1] = '\0';
|
||||
len--;
|
||||
}
|
||||
|
||||
if ( len == 0 ) {
|
||||
printf( "No campus-wide login information available. Info for this machine only:\r\n" );
|
||||
fflush( stdout );
|
||||
execl( FINGER_CMD, FINGER_CMD, NULL );
|
||||
} else {
|
||||
char *p;
|
||||
|
||||
/* skip and ignore stinking /w */
|
||||
if ( strncmp( buf, "/W ", 2 ) == 0 ) {
|
||||
p = buf + 2;
|
||||
} else {
|
||||
p = buf;
|
||||
}
|
||||
|
||||
for ( ; *p && isspace( (unsigned char) *p ); p++ )
|
||||
; /* NULL */
|
||||
|
||||
do_search( ld, p );
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
spaces2dots( char *s )
|
||||
{
|
||||
for ( ; *s; s++ ) {
|
||||
if ( *s == ' ' ) {
|
||||
*s = '.';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
do_search( LDAP *ld, char *buf )
|
||||
{
|
||||
char *dn, *rdn;
|
||||
char **title;
|
||||
int rc = 0, matches = 0, i;
|
||||
struct timeval tv;
|
||||
LDAPFiltDesc *fd;
|
||||
LDAPFiltInfo *fi = NULL;
|
||||
LDAPMessage *result, *e;
|
||||
static char *attrs[] = { "cn", "title", "objectClass", "joinable",
|
||||
#ifdef FINGER_SORT_ATTR
|
||||
FINGER_SORT_ATTR,
|
||||
#endif
|
||||
0 };
|
||||
|
||||
if ( (fd = ldap_init_getfilter( filterfile ))
|
||||
== NULL ) {
|
||||
fprintf( stderr, "Cannot open filter file (%s)\n",
|
||||
filterfile );
|
||||
exit( EXIT_FAILURE );
|
||||
}
|
||||
|
||||
for ( fi = ldap_getfirstfilter( fd, "finger", buf );
|
||||
fi != NULL;
|
||||
fi = ldap_getnextfilter( fd ) )
|
||||
{
|
||||
tv.tv_sec = FINGER_TIMEOUT;
|
||||
tv.tv_usec = 0;
|
||||
if ( (rc = ldap_search_st( ld, base, LDAP_SCOPE_SUBTREE,
|
||||
fi->lfi_filter, attrs, 0, &tv, &result ))
|
||||
!= LDAP_SUCCESS && rc != LDAP_SIZELIMIT_EXCEEDED
|
||||
&& rc != LDAP_TIMELIMIT_EXCEEDED )
|
||||
{
|
||||
fprintf( stderr, FINGER_UNAVAILABLE );
|
||||
ldap_perror( ld, "ldap_search_st" );
|
||||
exit( EXIT_FAILURE );
|
||||
}
|
||||
|
||||
if ( (matches = ldap_count_entries( ld, result )) != 0 )
|
||||
break;
|
||||
|
||||
ldap_msgfree( result );
|
||||
result = NULL;
|
||||
}
|
||||
|
||||
if ( rc == LDAP_SIZELIMIT_EXCEEDED ) {
|
||||
printf( "(Partial results - a size limit was exceeded)\r\n" );
|
||||
} else if ( rc == LDAP_TIMELIMIT_EXCEEDED ) {
|
||||
printf( "(Partial results - a time limit was exceeded)\r\n" );
|
||||
}
|
||||
|
||||
if ( matches == 0 ) {
|
||||
printf( FINGER_NOMATCH );
|
||||
fflush( stdout );
|
||||
} else if ( matches < 0 ) {
|
||||
fprintf( stderr, "error return from ldap_count_entries\r\n" );
|
||||
exit( EXIT_FAILURE );
|
||||
} else if ( matches <= FINGER_LISTLIMIT ) {
|
||||
printf( "%d %s match%s found for \"%s\":\r\n", matches,
|
||||
fi->lfi_desc, matches > 1 ? "es" : "", buf );
|
||||
fflush( stdout );
|
||||
|
||||
for ( e = ldap_first_entry( ld, result ); e != NULL; ) {
|
||||
do_read( ld, e );
|
||||
e = ldap_next_entry( ld, e );
|
||||
if ( e != NULL ) {
|
||||
printf( "--------------------\r\n" );
|
||||
}
|
||||
}
|
||||
} else {
|
||||
printf( "%d %s matches for \"%s\":\r\n", matches,
|
||||
fi->lfi_desc, buf );
|
||||
fflush( stdout );
|
||||
|
||||
#ifdef FINGER_SORT_ATTR
|
||||
ldap_sort_entries( ld, &result, FINGER_SORT_ATTR, strcasecmp );
|
||||
#endif
|
||||
|
||||
for ( e = ldap_first_entry( ld, result ); e != NULL;
|
||||
e = ldap_next_entry( ld, e ) ) {
|
||||
char *p;
|
||||
|
||||
dn = ldap_get_dn( ld, e );
|
||||
rdn = dn;
|
||||
if ( (p = strchr( dn, ',' )) != NULL )
|
||||
*p = '\0';
|
||||
while ( *rdn && *rdn != '=' )
|
||||
rdn++;
|
||||
if ( *rdn )
|
||||
rdn++;
|
||||
|
||||
/* hack attack */
|
||||
for ( i = 0; buf[i] != '\0'; i++ ) {
|
||||
if ( buf[i] == '.' || buf[i] == '_' )
|
||||
buf[i] = ' ';
|
||||
}
|
||||
if ( strcasecmp( rdn, buf ) == 0 ) {
|
||||
char **cn;
|
||||
int i, last;
|
||||
|
||||
cn = ldap_get_values( ld, e, "cn" );
|
||||
for ( i = 0; cn[i] != NULL; i++ ) {
|
||||
last = strlen( cn[i] ) - 1;
|
||||
if (isdigit((unsigned char) cn[i][last])) {
|
||||
rdn = strdup( cn[i] );
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
title = ldap_get_values( ld, e, "title" );
|
||||
|
||||
spaces2dots( rdn );
|
||||
printf( " %-20s %s\r\n", rdn,
|
||||
title ? title[0] : "" );
|
||||
if ( title != NULL ) {
|
||||
for ( i = 1; title[i] != NULL; i++ )
|
||||
printf( " %-20s %s\r\n", "",
|
||||
title[i] );
|
||||
}
|
||||
fflush( stdout );
|
||||
|
||||
if ( title != NULL )
|
||||
ldap_value_free( title );
|
||||
|
||||
free( dn );
|
||||
}
|
||||
}
|
||||
|
||||
if ( result != NULL ) {
|
||||
ldap_msgfree( result );
|
||||
}
|
||||
ldap_unbind( ld );
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
entry2textwrite( void *fp, char *buf, ber_len_t len )
|
||||
{
|
||||
return( fwrite( buf, len, 1, (FILE *)fp ) == 0 ? -1 : len );
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
do_read( LDAP *ld, LDAPMessage *e )
|
||||
{
|
||||
static struct ldap_disptmpl *tmpllist;
|
||||
static char *defattrs[] = { "mail", NULL };
|
||||
static char *mailvals[] = FINGER_NOEMAIL;
|
||||
static char **defvals[] = { mailvals, NULL };
|
||||
|
||||
ldap_init_templates( templatefile, &tmpllist );
|
||||
|
||||
if ( ldap_entry2text_search( ld, NULL, base, e, tmpllist, defattrs,
|
||||
defvals, entry2textwrite, (void *)stdout, "\r\n", rdncount,
|
||||
LDAP_DISP_OPT_DOSEARCHACTIONS ) != LDAP_SUCCESS ) {
|
||||
ldap_perror( ld, "ldap_entry2text_search" );
|
||||
exit( EXIT_FAILURE );
|
||||
}
|
||||
|
||||
if ( tmpllist != NULL ) {
|
||||
ldap_free_templates( tmpllist );
|
||||
}
|
||||
}
|
||||
@ -639,7 +639,6 @@ AC_PROG_LN_S
|
||||
AC_PATH_PROG(SENDMAIL, sendmail, /usr/lib/sendmail,
|
||||
$PATH:/usr/libexec:/usr/lib:/usr/sbin:/usr/etc:/etc)
|
||||
AC_PATH_PROG(EDITOR, vi, /usr/ucb/vi, $PATH:/usr/ucb)
|
||||
AC_PATH_PROG(FINGER, finger, /usr/ucb/finger, $PATH:/usr/ucb)
|
||||
|
||||
dnl ----------------------------------------------------------------
|
||||
dnl Perl
|
||||
@ -2826,7 +2825,6 @@ doc/man/man3/Makefile:build/top.mk:doc/man/man3/Makefile.in:build/man.mk \
|
||||
doc/man/man5/Makefile:build/top.mk:doc/man/man5/Makefile.in:build/man.mk \
|
||||
doc/man/man8/Makefile:build/top.mk:doc/man/man8/Makefile.in:build/man.mk \
|
||||
clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk \
|
||||
clients/finger/Makefile:build/top.mk:clients/finger/Makefile.in:build/rules.mk \
|
||||
clients/mail500/Makefile:build/top.mk:clients/mail500/Makefile.in:build/rules.mk \
|
||||
clients/ud/Makefile:build/top.mk:clients/ud/Makefile.in:build/rules.mk \
|
||||
clients/maildap/Makefile:build/top.mk:clients/maildap/Makefile.in:build/rules.mk \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user