*** /afs/sipb/project/dec-bsd/fingerd/fingerd.c	Tue Feb 23 13:53:15 1993
--- fingerd.c	Wed Apr  5 01:43:07 1995
***************
*** 56,58 ****
  	struct hostent *foohost;
! 	int i, p[2], pid, status;
  	FILE *fp;
--- 56,58 ----
  	struct hostent *foohost;
! 	int i, p[2], pid, status, w_switch;
  	FILE *fp;
***************
*** 77,78 ****
--- 77,79 ----
  	av[0] = "finger";
+ 	w_switch = 0;
  	for (i = 1;;) {
***************
*** 84,86 ****
  			sp += 2;
! 			av[i++] = "-l";
  		}
--- 85,90 ----
  			sp += 2;
! 			if (!w_switch) {
! 				av[i++] = "-l";
! 				w_switch = 1;
! 			}          
  		}
***************
*** 91,92 ****
--- 95,99 ----
  			*sp = '\0';
+ 			if (strchr(av[i - 1], '@')) {
+ 				av[i - 1][0] = '\0';
+ 			}
  		}