diff options
| author | joerg <joerg> | 2005-10-30 21:27:47 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2005-10-30 21:27:47 +0000 |
| commit | 784157c6e3b909775fc9de6a606dd6dbda28ca34 (patch) | |
| tree | 6685e8aa9183c4bb6062e80357cd0e96610cd395 /pkgtools/pkg_install | |
| parent | a68c1b6df940201953b6bc7e37f9327564af9161 (diff) | |
| download | pkgsrc-784157c6e3b909775fc9de6a606dd6dbda28ca34.tar.gz | |
Treat FTP error 450 like 550, otherwise pkg_add from a proftpd server
can hang.
Submitted-by: Eirik Nygaard
Diffstat (limited to 'pkgtools/pkg_install')
| -rw-r--r-- | pkgtools/pkg_install/files/lib/ftpio.c | 6 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkg_install/files/lib/ftpio.c b/pkgtools/pkg_install/files/lib/ftpio.c index 67f48c8887d..08a8f4b6981 100644 --- a/pkgtools/pkg_install/files/lib/ftpio.c +++ b/pkgtools/pkg_install/files/lib/ftpio.c @@ -1,4 +1,4 @@ -/* $NetBSD: ftpio.c,v 1.17 2005/06/02 10:31:11 wiz Exp $ */ +/* $NetBSD: ftpio.c,v 1.18 2005/10/30 21:27:47 joerg Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -8,7 +8,7 @@ #include <sys/cdefs.h> #endif #ifndef lint -__RCSID("$NetBSD: ftpio.c,v 1.17 2005/06/02 10:31:11 wiz Exp $"); +__RCSID("$NetBSD: ftpio.c,v 1.18 2005/10/30 21:27:47 joerg Exp $"); #endif /*- @@ -688,7 +688,7 @@ ftp_expand_URL(const char *base, char *pattern) (int)(s-pattern), pattern, tmpname); } - rc = ftp_cmd(buf, "\n(550|226).*\n"); /* catch errors */ + rc = ftp_cmd(buf, "\n(550|450|226).*\n"); /* catch errors */ if (rc != 226) { if (Verbose) warnx("nlist failed!"); diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index 75f6bfb2a71..8642bc8f70e 100644 --- a/pkgtools/pkg_install/files/lib/version.h +++ b/pkgtools/pkg_install/files/lib/version.h @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.47 2005/07/18 09:14:04 hubertf Exp $ */ +/* $NetBSD: version.h,v 1.48 2005/10/30 21:27:47 joerg Exp $ */ /* * Copyright (c) 2001 Thomas Klausner. All rights reserved. @@ -33,6 +33,6 @@ #ifndef _INST_LIB_VERSION_H_ #define _INST_LIB_VERSION_H_ -#define PKGTOOLS_VERSION "20050718" +#define PKGTOOLS_VERSION "20051030" #endif /* _INST_LIB_VERSION_H_ */ |