Treat FTP error 450 like 550, otherwise pkg_add from a proftpd server

can hang.

Submitted-by: Eirik Nygaard
This commit is contained in:
joerg 2005-10-30 21:52:02 +00:00
parent 4535d519d7
commit 82543d8598
2 changed files with 5 additions and 5 deletions

View File

@ -1,8 +1,8 @@
/* $NetBSD: ftpio.c,v 1.67 2005/03/18 00:01:11 hubertf Exp $ */
/* $NetBSD: ftpio.c,v 1.68 2005/10/30 21:52:02 joerg Exp $ */
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: ftpio.c,v 1.67 2005/03/18 00:01:11 hubertf Exp $");
__RCSID("$NetBSD: ftpio.c,v 1.68 2005/10/30 21:52:02 joerg Exp $");
#endif
/*-
@ -645,7 +645,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!");

View File

@ -1,4 +1,4 @@
/* $NetBSD: version.h,v 1.68 2005/07/18 09:09:35 hubertf Exp $ */
/* $NetBSD: version.h,v 1.69 2005/10/30 21:52:02 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_ */