===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/util.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -c -r1.30 -r1.31
*** src/usr.bin/ftp/util.c	2002/07/12 00:25:30	1.30
--- src/usr.bin/ftp/util.c	2002/11/08 03:30:17	1.31
***************
*** 1,4 ****
! /*	$OpenBSD: util.c,v 1.30 2002/07/12 00:25:30 deraadt Exp $	*/
  /*	$NetBSD: util.c,v 1.12 1997/08/18 10:20:27 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: util.c,v 1.31 2002/11/08 03:30:17 fgsch Exp $	*/
  /*	$NetBSD: util.c,v 1.12 1997/08/18 10:20:27 lukem Exp $	*/
  
  /*
***************
*** 35,41 ****
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: util.c,v 1.30 2002/07/12 00:25:30 deraadt Exp $";
  #endif /* not lint */
  
  /*
--- 35,41 ----
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: util.c,v 1.31 2002/11/08 03:30:17 fgsch Exp $";
  #endif /* not lint */
  
  /*
***************
*** 152,158 ****
  		curtype = TYPE_A;
  		type = 0;
  		if (autologin)
! 			(void)login(argv[1], NULL, NULL);
  
  #if (defined(unix) || defined(BSD)) && NBBY == 8
  /*
--- 152,158 ----
  		curtype = TYPE_A;
  		type = 0;
  		if (autologin)
! 			(void)ftp_login(argv[1], NULL, NULL);
  
  #if (defined(unix) || defined(BSD)) && NBBY == 8
  /*
***************
*** 207,213 ****
   * login to remote host, using given username & password if supplied
   */
  int
! login(host, user, pass)
  	const char *host;
  	char *user, *pass;
  {
--- 207,213 ----
   * login to remote host, using given username & password if supplied
   */
  int
! ftp_login(host, user, pass)
  	const char *host;
  	char *user, *pass;
  {