summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authoradrianp <adrianp>2007-08-22 23:23:22 +0000
committeradrianp <adrianp>2007-08-22 23:23:22 +0000
commitfbb81479624ff6cc444284de01616dc5deb78165 (patch)
treef4972486d57234a296e065aea0e79459aafd4dc9 /pkgtools
parentafc0cbd496385556bda30d008788267b0f4801a6 (diff)
downloadpkgsrc-fbb81479624ff6cc444284de01616dc5deb78165.tar.gz
Fix a bug in the processing of GPG in audit-packages.conf. This should fix
PR# 36773 opened by David A. Holland. While we're here look for settings with no values in audit-packages.conf and ignore them. Tighten up processing of audit-packages.conf for the situation where settings are specified multiple times. (report from joerg@).
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_install/files/audit-packages/audit-packages.c36
1 files changed, 28 insertions, 8 deletions
diff --git a/pkgtools/pkg_install/files/audit-packages/audit-packages.c b/pkgtools/pkg_install/files/audit-packages/audit-packages.c
index e5828758cec..79d46339a21 100644
--- a/pkgtools/pkg_install/files/audit-packages/audit-packages.c
+++ b/pkgtools/pkg_install/files/audit-packages/audit-packages.c
@@ -1,4 +1,4 @@
-/* $NetBSD: audit-packages.c,v 1.10 2007/08/15 01:49:02 joerg Exp $ */
+/* $NetBSD: audit-packages.c,v 1.11 2007/08/22 23:23:22 adrianp Exp $ */
/*
* Copyright (c) 2007 Adrian Portelli <adrianp@NetBSD.org>.
@@ -574,6 +574,7 @@ char *
clean_conf(char *conf_line)
{
int i = 0;
+ size_t len = 0;
char *token = NULL;
char *cp;
@@ -600,6 +601,13 @@ clean_conf(char *conf_line)
}
}
+ len = strlen(token);
+
+ /* look for entries with no associated value */
+ if (len == 0) {
+ token = NULL;
+ }
+
return token;
}
@@ -611,6 +619,9 @@ get_confvalues(void)
char *line_ptr = NULL;
char *line = NULL;
char *retval = NULL;
+ Boolean f_ignore = FALSE;
+ Boolean f_verify_bin = FALSE;
+ Boolean f_set_pvfile = FALSE;
if ((conf = fopen(conf_file, "r")) == NULL) {
if (verbose >= 2)
@@ -629,20 +640,29 @@ get_confvalues(void)
if ((line[0] == '#') || (line[0] == '\n'))
continue;
- if (strncmp(line, "IGNORE_URLS", 11) == 0) {
+ if ((strncmp(line, "IGNORE_URLS", 11) == 0) &&
+ (f_ignore == FALSE)) {
retval = clean_conf(line);
- if (retval != NULL)
+ if (retval != NULL) {
ignore = safe_strdup(retval);
+ f_ignore = TRUE;
+ }
}
- else if (strncmp(line, "GPG", 3) == 0) {
+ else if ((strncmp(line, "GPG", 3) == 0) &&
+ (f_verify_bin == FALSE)) {
retval = clean_conf(line);
- if (retval != NULL)
- verify_bin = retval;
+ if (retval != NULL) {
+ verify_bin = safe_strdup(retval);
+ f_verify_bin = TRUE;
+ }
}
- else if (strncmp(line, "PKGVULNDIR", 9) == 0) {
+ else if ((strncmp(line, "PKGVULNDIR", 9) == 0) &&
+ (f_set_pvfile == FALSE)) {
retval = clean_conf(line);
- if (retval != NULL)
+ if (retval != NULL) {
set_pvfile(retval);
+ f_set_pvfile = TRUE;
+ }
}
retval = NULL;