qmail/queue-fix-todo.patch

   1 --- queue-fix-1.4/queue-fix.c-ori       Tue Aug 17 09:43:58 1999
   2 +++ queue-fix-1.4/queue-fix.c   Tue Aug 17 09:52:16 1999
   3 @@ -445,9 +445,9 @@
   4                         if(rename_mess("info/",part,new_part,d->d_name,inode)) { closedir(dir); return -1; }
   5                         if(rename_mess("local/",part,new_part,d->d_name,inode)) { closedir(dir); return -1; }
   6                         if(rename_mess("remote/",part,new_part,d->d_name,inode)) { closedir(dir); return -1; }
   7 +                       if(rename_mess("intd/",part,new_part,d->d_name,inode)) { closedir(dir); return -1; }
   8 +                       if(rename_mess("todo/",part,new_part,d->d_name,inode)) { closedir(dir); return -1; }
   9
  10 -                       if(rename_mess("intd","","",d->d_name,inode)) { closedir(dir); return -1; }
  11 -                       if(rename_mess("todo","","",d->d_name,inode)) { closedir(dir); return -1; }
  12                         if(rename_mess("bounce","","",d->d_name,inode)) { closedir(dir); return -1; }
  13                 }
  14         }
  15 @@ -513,9 +513,9 @@
  16                 if(clean_tmp("info/",name_num)) return -1;
  17                 if(clean_tmp("local/",name_num)) return -1;
  18                 if(clean_tmp("remote/",name_num)) return -1;
  19 +               if(clean_tmp("intd/",name_num)) return -1;
  20 +               if(clean_tmp("todo/",name_num)) return -1;
  21         }
  22 -       if(clean_tmp("intd","")) return -1;
  23 -       if(clean_tmp("todo","")) return -1;
  24         if(clean_tmp("bounce","")) return -1;
  25
  26         return 0;
  27 @@ -553,19 +553,19 @@
  28         if(check_item(check_dir.s,qmails_uid,qmail_gid,0700,'d',0)) return -1;
  29         if(check_splits(check_dir.s,qmails_uid,qmail_gid,0700,qmail_gid,0600)) return -1;
  30
  31 -       /*check the others*/
  32         if(!stralloc_copy(&check_dir,&queue_dir)) die_nomem();
  33         if(!stralloc_cats(&check_dir,"todo")) die_nomem();
  34         if(!stralloc_0(&check_dir)) die_nomem();
  35         if(check_item(check_dir.s,qmailq_uid,qmail_gid,0750,'d',0)) return -1;
  36 -       if(check_files(check_dir.s,qmailq_uid,-1,0644)) return -1;
  37 +       if(check_splits(check_dir.s,qmailq_uid,qmail_gid,0750,qmail_gid,0600)) return -1;
  38
  39         if(!stralloc_copy(&check_dir,&queue_dir)) die_nomem();
  40         if(!stralloc_cats(&check_dir,"intd")) die_nomem();
  41         if(!stralloc_0(&check_dir)) die_nomem();
  42         if(check_item(check_dir.s,qmailq_uid,qmail_gid,0700,'d',0)) return -1;
  43 -       if(check_files(check_dir.s,qmailq_uid,-1,0644)) return -1;
  44 +       if(check_splits(check_dir.s,qmailq_uid,qmail_gid,0750,qmail_gid,0644)) return -1;
  45
  46 +       /*check the others*/
  47         if(!stralloc_copy(&check_dir,&queue_dir)) die_nomem();
  48         if(!stralloc_cats(&check_dir,"bounce")) die_nomem();
  49         if(!stralloc_0(&check_dir)) die_nomem();
  50 @@ -684,16 +684,14 @@
  51         if(!stralloc_cats(&check_dir,"remote")) die_nomem();
  52         if(check_stray_parts()) return -1;
  53
  54 -
  55         if(!stralloc_copy(&check_dir,&queue_dir)) die_nomem();
  56         if(!stralloc_cats(&check_dir,"todo")) die_nomem();
  57 -       if(!stralloc_0(&check_dir)) die_nomem();
  58 -       if(check_strays(check_dir.s)) return -1;
  59 +       if(check_stray_parts()) return -1;
  60
  61         if(!stralloc_copy(&check_dir,&queue_dir)) die_nomem();
  62         if(!stralloc_cats(&check_dir,"intd")) die_nomem();
  63 -       if(!stralloc_0(&check_dir)) die_nomem();
  64 -       if(check_strays(check_dir.s)) return -1;
  65 +       if(check_stray_parts()) return -1;
  66 +
  67
  68         if(!stralloc_copy(&check_dir,&queue_dir)) die_nomem();
  69         if(!stralloc_cats(&check_dir,"bounce")) die_nomem();