diff options
| -rw-r--r-- | usr.bin/ftp/extern.h | 7 | ||||
| -rw-r--r-- | usr.bin/ftp/ruserpass.c | 8 | ||||
| -rw-r--r-- | usr.bin/ftp/util.c | 6 |
3 files changed, 13 insertions, 8 deletions
diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h index d12b7c4ba58..37287a60f60 100644 --- a/usr.bin/ftp/extern.h +++ b/usr.bin/ftp/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.28 2005/10/12 06:50:42 otto Exp $ */ +/* $OpenBSD: extern.h,v 1.29 2007/06/06 19:15:33 pyr Exp $ */ /* $NetBSD: extern.h,v 1.17 1997/08/18 10:20:19 lukem Exp $ */ /* @@ -149,7 +149,6 @@ void reset(int, char **); void restart(int, char **); void rmthelp(int, char **); void rmtstatus(int, char **); -int ruserpass(const char *, char **, char **, char **); void sendrequest(const char *, const char *, const char *, int); void setascii(int, char **); void setbell(int, char **); @@ -190,6 +189,10 @@ int togglevar(int, char **, int *, const char *); void usage(void); void user(int, char **); +#ifndef SMALL +int ruserpass(const char *, char **, char **, char **); +#endif + extern jmp_buf abortprox; extern int abrtflag; diff --git a/usr.bin/ftp/ruserpass.c b/usr.bin/ftp/ruserpass.c index e5a610ec229..77181734b48 100644 --- a/usr.bin/ftp/ruserpass.c +++ b/usr.bin/ftp/ruserpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ruserpass.c,v 1.23 2007/03/24 14:29:02 moritz Exp $ */ +/* $OpenBSD: ruserpass.c,v 1.24 2007/06/06 19:15:33 pyr Exp $ */ /* $NetBSD: ruserpass.c,v 1.14 1997/07/20 09:46:01 lukem Exp $ */ /* @@ -30,13 +30,12 @@ * SUCH DAMAGE. */ +#ifndef SMALL #ifndef lint #if 0 static char sccsid[] = "@(#)ruserpass.c 8.4 (Berkeley) 4/27/95"; #else -#ifndef SMALL -static const char rcsid[] = "$OpenBSD: ruserpass.c,v 1.23 2007/03/24 14:29:02 moritz Exp $"; -#endif /* SMALL */ +static const char rcsid[] = "$OpenBSD: ruserpass.c,v 1.24 2007/06/06 19:15:33 pyr Exp $"; #endif #endif /* not lint */ @@ -315,3 +314,4 @@ token(void) return (t->tval); return (ID); } +#endif diff --git a/usr.bin/ftp/util.c b/usr.bin/ftp/util.c index 60c1e397f71..c03a9034003 100644 --- a/usr.bin/ftp/util.c +++ b/usr.bin/ftp/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.45 2006/11/02 01:51:33 ray Exp $ */ +/* $OpenBSD: util.c,v 1.46 2007/06/06 19:15:33 pyr Exp $ */ /* $NetBSD: util.c,v 1.12 1997/08/18 10:20:27 lukem Exp $ */ /*- @@ -71,7 +71,7 @@ */ #if !defined(lint) && !defined(SMALL) -static const char rcsid[] = "$OpenBSD: util.c,v 1.45 2006/11/02 01:51:33 ray Exp $"; +static const char rcsid[] = "$OpenBSD: util.c,v 1.46 2007/06/06 19:15:33 pyr Exp $"; #endif /* not lint and not SMALL */ /* @@ -253,12 +253,14 @@ ftp_login(const char *host, char *user, char *pass) int n, aflag = 0, retry = 0; struct passwd *pw; +#ifndef SMALL if (user == NULL) { if (ruserpass(host, &user, &pass, &acctname) < 0) { code = -1; return (0); } } +#endif /* * Set up arguments for an anonymous FTP session, if necessary. |