summaryrefslogtreecommitdiffabout
path: root/src/verify.c
Side-by-side diff
Diffstat (limited to 'src/verify.c') (more/less context) (ignore whitespace changes)
-rw-r--r--src/verify.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/verify.c b/src/verify.c
index 7520466..01c61ea 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -190,21 +190,24 @@ uploader_find_frp (struct uploader_info *list, const char *fpr)
if (list->fpr && strcmp (list->fpr, fpr) == 0)
break;
return list;
}
int
-verify_directive_file (struct file_triplet *trp, const struct spool *spool)
+verify_directive_file (struct file_triplet *trp)
{
char *command;
- struct dictionary *dict = spool->dictionary[project_uploader_dict];
int rc;
void *md;
-
size_t nrows, ncols, i;
struct uploader_info *head, *tail;
+ const struct spool *spool;
+ struct dictionary *dict;
+
+ ASGN_SPOOL (spool, trp, return 1);
+ dict = spool->dictionary[project_uploader_dict];
if (!trp->file[file_directive].name)
return 1;
if (fill_project_name (trp))
return 1;
@@ -298,13 +301,13 @@ verify_directive_file (struct file_triplet *trp, const struct spool *spool)
return 1;
}
trp->uploader_list = head;
trp->uploader = NULL;
- if (verify_directive_signature (trp, spool))
+ if (verify_directive_signature (trp))
{
/*FIXME: Update stats */
logmsg (LOG_ERR, _("invalid signature for %s"),
trp->name ? trp->name : "[unknown]");
return 1;
}

Return to:

Send suggestions and report system problems to the System administrator.