diff options
Diffstat (limited to 'src/verify.c')
-rw-r--r-- | src/verify.c | 11 |
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) | |||
190 | if (list->fpr && strcmp (list->fpr, fpr) == 0) | 190 | if (list->fpr && strcmp (list->fpr, fpr) == 0) |
191 | break; | 191 | break; |
192 | return list; | 192 | return list; |
193 | } | 193 | } |
194 | 194 | ||
195 | int | 195 | int |
196 | verify_directive_file (struct file_triplet *trp, const struct spool *spool) | 196 | verify_directive_file (struct file_triplet *trp) |
197 | { | 197 | { |
198 | char *command; | 198 | char *command; |
199 | struct dictionary *dict = spool->dictionary[project_uploader_dict]; | ||
200 | int rc; | 199 | int rc; |
201 | void *md; | 200 | void *md; |
202 | |||
203 | size_t nrows, ncols, i; | 201 | size_t nrows, ncols, i; |
204 | struct uploader_info *head, *tail; | 202 | struct uploader_info *head, *tail; |
203 | const struct spool *spool; | ||
204 | struct dictionary *dict; | ||
205 | |||
206 | ASGN_SPOOL (spool, trp, return 1); | ||
207 | dict = spool->dictionary[project_uploader_dict]; | ||
205 | 208 | ||
206 | if (!trp->file[file_directive].name) | 209 | if (!trp->file[file_directive].name) |
207 | return 1; | 210 | return 1; |
208 | 211 | ||
209 | if (fill_project_name (trp)) | 212 | if (fill_project_name (trp)) |
210 | return 1; | 213 | return 1; |
@@ -298,13 +301,13 @@ verify_directive_file (struct file_triplet *trp, const struct spool *spool) | |||
298 | return 1; | 301 | return 1; |
299 | } | 302 | } |
300 | 303 | ||
301 | trp->uploader_list = head; | 304 | trp->uploader_list = head; |
302 | trp->uploader = NULL; | 305 | trp->uploader = NULL; |
303 | 306 | ||
304 | if (verify_directive_signature (trp, spool)) | 307 | if (verify_directive_signature (trp)) |
305 | { | 308 | { |
306 | /*FIXME: Update stats */ | 309 | /*FIXME: Update stats */ |
307 | logmsg (LOG_ERR, _("invalid signature for %s"), | 310 | logmsg (LOG_ERR, _("invalid signature for %s"), |
308 | trp->name ? trp->name : "[unknown]"); | 311 | trp->name ? trp->name : "[unknown]"); |
309 | return 1; | 312 | return 1; |
310 | } | 313 | } |