--- queue-fix-1.4/queue-fix.c-ori Tue Aug 17 09:43:58 1999 +++ queue-fix-1.4/queue-fix.c Tue Aug 17 09:52:16 1999 @@ -445,9 +445,9 @@ if(rename_mess("info/",part,new_part,d->d_name,inode)) { closedir(dir); return -1; } if(rename_mess("local/",part,new_part,d->d_name,inode)) { closedir(dir); return -1; } if(rename_mess("remote/",part,new_part,d->d_name,inode)) { closedir(dir); return -1; } + if(rename_mess("intd/",part,new_part,d->d_name,inode)) { closedir(dir); return -1; } + if(rename_mess("todo/",part,new_part,d->d_name,inode)) { closedir(dir); return -1; } - if(rename_mess("intd","","",d->d_name,inode)) { closedir(dir); return -1; } - if(rename_mess("todo","","",d->d_name,inode)) { closedir(dir); return -1; } if(rename_mess("bounce","","",d->d_name,inode)) { closedir(dir); return -1; } } } @@ -513,9 +513,9 @@ if(clean_tmp("info/",name_num)) return -1; if(clean_tmp("local/",name_num)) return -1; if(clean_tmp("remote/",name_num)) return -1; + if(clean_tmp("intd/",name_num)) return -1; + if(clean_tmp("todo/",name_num)) return -1; } - if(clean_tmp("intd","")) return -1; - if(clean_tmp("todo","")) return -1; if(clean_tmp("bounce","")) return -1; return 0; @@ -553,19 +553,19 @@ if(check_item(check_dir.s,qmails_uid,qmail_gid,0700,'d',0)) return -1; if(check_splits(check_dir.s,qmails_uid,qmail_gid,0700,qmail_gid,0600)) return -1; - /*check the others*/ if(!stralloc_copy(&check_dir,&queue_dir)) die_nomem(); if(!stralloc_cats(&check_dir,"todo")) die_nomem(); if(!stralloc_0(&check_dir)) die_nomem(); if(check_item(check_dir.s,qmailq_uid,qmail_gid,0750,'d',0)) return -1; - if(check_files(check_dir.s,qmailq_uid,-1,0644)) return -1; + if(check_splits(check_dir.s,qmailq_uid,qmail_gid,0750,qmail_gid,0600)) return -1; if(!stralloc_copy(&check_dir,&queue_dir)) die_nomem(); if(!stralloc_cats(&check_dir,"intd")) die_nomem(); if(!stralloc_0(&check_dir)) die_nomem(); if(check_item(check_dir.s,qmailq_uid,qmail_gid,0700,'d',0)) return -1; - if(check_files(check_dir.s,qmailq_uid,-1,0644)) return -1; + if(check_splits(check_dir.s,qmailq_uid,qmail_gid,0750,qmail_gid,0644)) return -1; + /*check the others*/ if(!stralloc_copy(&check_dir,&queue_dir)) die_nomem(); if(!stralloc_cats(&check_dir,"bounce")) die_nomem(); if(!stralloc_0(&check_dir)) die_nomem(); @@ -684,16 +684,14 @@ if(!stralloc_cats(&check_dir,"remote")) die_nomem(); if(check_stray_parts()) return -1; - if(!stralloc_copy(&check_dir,&queue_dir)) die_nomem(); if(!stralloc_cats(&check_dir,"todo")) die_nomem(); - if(!stralloc_0(&check_dir)) die_nomem(); - if(check_strays(check_dir.s)) return -1; + if(check_stray_parts()) return -1; if(!stralloc_copy(&check_dir,&queue_dir)) die_nomem(); if(!stralloc_cats(&check_dir,"intd")) die_nomem(); - if(!stralloc_0(&check_dir)) die_nomem(); - if(check_strays(check_dir.s)) return -1; + if(check_stray_parts()) return -1; + if(!stralloc_copy(&check_dir,&queue_dir)) die_nomem(); if(!stralloc_cats(&check_dir,"bounce")) die_nomem();