diff options
| author | Alexander Hall <halex@cvs.openbsd.org> | 2009-06-04 23:37:10 +0000 |
|---|---|---|
| committer | Alexander Hall <halex@cvs.openbsd.org> | 2009-06-04 23:37:10 +0000 |
| commit | a513404baf363e211790bd230dd8448444415fbb (patch) | |
| tree | 26f57587e507ea0418b2ab7d309a636200eb704d | |
| parent | 689bd1eeb026568198e95ea3482afc2390fb11a3 (diff) | |
silently ignore -a if a username is supplied in the url
"looks sensible" deraadt@, "fine by me" martynas@
also removed an indeed misplaced/outdated comment per martynas@ request
| -rw-r--r-- | usr.bin/ftp/fetch.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c index be548efe7b1..a8000fbad87 100644 --- a/usr.bin/ftp/fetch.c +++ b/usr.bin/ftp/fetch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fetch.c,v 1.88 2009/06/04 20:58:34 martynas Exp $ */ +/* $OpenBSD: fetch.c,v 1.89 2009/06/04 23:37:09 halex Exp $ */ /* $NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $ */ /*- @@ -1010,9 +1010,11 @@ bad_ftp_url: } oautologin = autologin; if (username == NULL) - anonftp = 1; /* Handle "automatic" transfers. */ - else + anonftp = 1; + else { + anonftp = 0; autologin = 0; + } setpeer(xargc, xargv); autologin = oautologin; if (connected == 0 || |