===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/util.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/ftp/util.c	1997/04/23 20:33:24	1.7
--- src/usr.bin/ftp/util.c	1997/05/05 20:49:51	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: util.c,v 1.7 1997/04/23 20:33:24 deraadt Exp $	*/
  /*	$NetBSD: util.c,v 1.7 1997/04/14 09:09:24 lukem Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: util.c,v 1.8 1997/05/05 20:49:51 jkatz Exp $	*/
  /*	$NetBSD: util.c,v 1.7 1997/04/14 09:09:24 lukem Exp $	*/
  
  /*
***************
*** 35,41 ****
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: util.c,v 1.7 1997/04/23 20:33:24 deraadt Exp $";
  #endif /* not lint */
  
  /*
--- 35,41 ----
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: util.c,v 1.8 1997/05/05 20:49:51 jkatz Exp $";
  #endif /* not lint */
  
  /*
***************
*** 183,189 ****
  	char *acct;
  	char anonpass[MAXLOGNAME + 1 + MAXHOSTNAMELEN];	/* "user@hostname" */
  	char hostname[MAXHOSTNAMELEN];
! 	int n, aflag = 0;
  
  	acct = NULL;
  	if (user == NULL) {
--- 183,189 ----
  	char *acct;
  	char anonpass[MAXLOGNAME + 1 + MAXHOSTNAMELEN];	/* "user@hostname" */
  	char hostname[MAXHOSTNAMELEN];
! 	int n, aflag, retry = 0;
  
  	acct = NULL;
  	if (user == NULL) {
***************
*** 220,228 ****
--- 220,235 ----
  		    user, hp->h_name);
  #endif
  		pass = anonpass;
+ 		user = "ftp";
+ 	}
+ 
+ tryagain:
+ 
+ 	if (retry) {
  		user = "anonymous";
  	}
  
+ 
  	while (user == NULL) {
  		char *myname = getlogin();
  
***************
*** 258,264 ****
  	if ((n != COMPLETE) ||
  	    (!aflag && acct != NULL && command("ACCT %s", acct) != COMPLETE)) {
  		warnx("Login failed.");
! 		return (0);
  	}
  	if (proxy)
  		return (1);
--- 265,276 ----
  	if ((n != COMPLETE) ||
  	    (!aflag && acct != NULL && command("ACCT %s", acct) != COMPLETE)) {
  		warnx("Login failed.");
! 		if (retry){
! 			return (0);
! 		} else
! 		retry = 1;
! 		goto tryagain;
! 
  	}
  	if (proxy)
  		return (1);