diff options
author | joerg <joerg> | 2008-08-21 16:04:39 +0000 |
---|---|---|
committer | joerg <joerg> | 2008-08-21 16:04:39 +0000 |
commit | dd70e4a798474beb1fd3d515ec8afe616e561230 (patch) | |
tree | f20735a92d70b7748acff18a798c4c1fc54f0e6d /pkgtools/pkg_install/files/admin/audit.c | |
parent | 01804cf20a0d6597bc74ea1fe8318ddc68ecd1cb (diff) | |
download | pkgsrc-dd70e4a798474beb1fd3d515ec8afe616e561230.tar.gz |
pkg_install-20080821:
- Recognize file:// urls to prevent double quoting.
- Fix some err/errx botchups.
- Add configuration options for verbose logging of net IO, enabling of
active FTP (switching to passive FTP as default) and for ignoring proxy
settings.
- When iterating over PACKAGES to find a match, warn if an entry can't
processed (e.g. bad URL).
Diffstat (limited to 'pkgtools/pkg_install/files/admin/audit.c')
-rw-r--r-- | pkgtools/pkg_install/files/admin/audit.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgtools/pkg_install/files/admin/audit.c b/pkgtools/pkg_install/files/admin/audit.c index 2243686689f..484f19d9896 100644 --- a/pkgtools/pkg_install/files/admin/audit.c +++ b/pkgtools/pkg_install/files/admin/audit.c @@ -1,4 +1,4 @@ -/* $NetBSD: audit.c,v 1.8.2.3 2008/08/02 20:33:50 joerg Exp $ */ +/* $NetBSD: audit.c,v 1.8.2.4 2008/08/21 16:04:39 joerg Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -8,7 +8,7 @@ #include <sys/cdefs.h> #endif #ifndef lint -__RCSID("$NetBSD: audit.c,v 1.8.2.3 2008/08/02 20:33:50 joerg Exp $"); +__RCSID("$NetBSD: audit.c,v 1.8.2.4 2008/08/21 16:04:39 joerg Exp $"); #endif /*- @@ -355,18 +355,21 @@ fetch_pkg_vulnerabilities(int argc, char **argv) if (verbose >= 2) fprintf(stderr, "Fetching %s\n", pkg_vulnerabilities_url); - f = fetchXGetURL(pkg_vulnerabilities_url, &st, ""); + f = fetchXGetURL(pkg_vulnerabilities_url, &st, fetch_flags); if (f == NULL) - err(EXIT_FAILURE, "Could not fetch vulnerability file"); + errx(EXIT_FAILURE, "Could not fetch vulnerability file: %s", + fetchLastErrString); if (st.size > SSIZE_MAX - 1) - err(EXIT_FAILURE, "pkg-vulnerabilities is too large"); + errx(EXIT_FAILURE, "pkg-vulnerabilities is too large"); buf_len = st.size; buf = xmalloc(buf_len + 1); if (fetchIO_read(f, buf, buf_len) != buf_len) - err(EXIT_FAILURE, "Failure during fetch of pkg-vulnerabilities"); + errx(EXIT_FAILURE, + "Failure during fetch of pkg-vulnerabilities: %s", + fetchLastErrString); buf[buf_len] = '\0'; if (decompress_buffer(buf, buf_len, &decompressed_input, |