Rename directory_pair to spool

1 files changed, 7 insertions, 7 deletions

diff --git a/src/verify.c b/src/verify.c
index cc3121c..5d82d2f 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -92,10 +92,10 @@ make_default_meta (struct metadef def[5], const char *user,
 /* Verify if USER has upload rights on the directory (project) requested
    by TRP */
 int
-check_access_rights (struct file_triplet *trp, struct directory_pair *dpair,
+check_access_rights (struct file_triplet *trp, struct spool *spool,
 		     const char *user)
 {
-  struct access_method *method = dpair->access_method[verify_method];
+  struct access_method *method = spool->access_method[verify_method];
   int rc;
   char *command;
   const char *result;
@@ -135,7 +135,7 @@ check_access_rights (struct file_triplet *trp, struct directory_pair *dpair,
       UPDATE_STATS (STAT_ACCESS_VIOLATIONS);
       logmsg (LOG_ERR, "%s: %s has no rights on %s",
 	      trp->name, user, trp->project);
-      notify (dpair->notification, trp, ev_bad_ownership);
+      notify (spool->notification, trp, ev_bad_ownership);
       return 1;
     }
 
@@ -143,11 +143,11 @@ check_access_rights (struct file_triplet *trp, struct directory_pair *dpair,
 }
 
 int
-verify_directive_file (struct file_triplet *trp, struct directory_pair *dpair)
+verify_directive_file (struct file_triplet *trp, struct spool *spool)
 {
   struct passwd *pw;
   char *command;
-  struct access_method *method = dpair->access_method[gpg_key_method];
+  struct access_method *method = spool->access_method[gpg_key_method];
   const char *pubkey;
   int rc;
   struct metadef def[5];
@@ -195,7 +195,7 @@ verify_directive_file (struct file_triplet *trp, struct directory_pair *dpair)
   if (debug_level > 3)
     logmsg (LOG_DEBUG, "Public key: %s", pubkey);
 
-  if (verify_directive_signature (trp, dpair, pubkey))
+  if (verify_directive_signature (trp, spool, pubkey))
     {
       /*FIXME: Update stats */
       logmsg (LOG_ERR, "invalid signature for %s", trp->name);
@@ -217,7 +217,7 @@ verify_directive_file (struct file_triplet *trp, struct directory_pair *dpair)
   if (verify_directive_format (trp))
     return 1;
 
-  if (check_access_rights (trp, dpair, trp->user))
+  if (check_access_rights (trp, spool, trp->user))
     return 1;
 
   return 0;