X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=inn-innduct.git;a=blobdiff_plain;f=backends%2Finnduct.c;h=0258ad022de0ce6b17341679f0449c7fb43745be;hp=018d6bca9adfdba6d6bf37b2501365d8f9218612;hb=c2c88becbf08aa2b088ee42e6ed3331f733cbaaf;hpb=66b5a94b5a5678552aeab580d0b2964c6d8af1ad diff --git a/backends/innduct.c b/backends/innduct.c index 018d6bc..0258ad0 100644 --- a/backends/innduct.c +++ b/backends/innduct.c @@ -1,6 +1,8 @@ /* * TODO * - close idle connections + * - cope better with garbage in feed file + * - cope better with NULs in feed file * - -k kill mode ? */ @@ -190,6 +192,8 @@ perl -ne 'print if m/-8\<-/..m/-\>8-/; print "\f" if m/-\^L-/' backends/innduct. #define INNDCOMMCHILD_ESTATUS_FAIL 6 #define INNDCOMMCHILD_ESTATUS_NONESUCH 7 +#define MAX_LINE_FEEDFILE (NNTP_MSGID_MAXLEN + sizeof(TOKEN)*2 + 10) + /*----- doubly linked lists -----*/ #define ISNODE(T) struct { T *succ, *pred; } node /* must be at start */ @@ -245,6 +249,7 @@ typedef struct Conn Conn; typedef struct Article Article; typedef struct InputFile InputFile; typedef struct XmitDetails XmitDetails; +typedef struct Filemon_Perfile Filemon_Perfile; typedef enum StateMachineState StateMachineState; DEFLIST(Conn); @@ -258,18 +263,32 @@ static void *conn_write_some_xmits(Conn *conn); static void xmit_free(XmitDetails *d); -static int filemon_init(void); -static void filemon_setfile(int mainfeed_fd, const char *mainfeed_path); -static void filemon_callback(void); - static void statemc_setstate(StateMachineState newsms, int periods, const char *forlog, const char *why); +static void statemc_start_flush(const char *why); /* Normal => Flushing */ +static void spawn_inndcomm_flush(const char *why); /* Moved => Flushing */ + static void check_master_queue(void); static void queue_check_input_done(void); +static void statemc_check_flushing_done(void); +static void statemc_check_backlog_done(void); + static void postfork(const char *what); static void postfork_inputfile(InputFile *ipf); +static void open_defer(void); +static void close_defer(void); +static void search_backlog_file(void); + +static void inputfile_tailing_start(InputFile *ipf); +static void inputfile_tailing_stop(InputFile *ipf); + +static int filemon_init(void); +static void filemon_start(InputFile *ipf); +static void filemon_stop(InputFile *ipf); +static void filemon_callback(InputFile *ipf); + /*----- configuration options -----*/ static char *sitename, *feedfile; @@ -277,6 +296,12 @@ static const char *remote_host; static int quiet_multiple=0, become_daemon=1; static int max_connections=10, max_queue_per_conn=200; +static int target_max_feedfile_size=100000; + +static double max_bad_data_ratio= 0.01; +static int max_bad_data_initial= 30; + /* in one corrupt 4096-byte block the number of newlines has + * mean 16 and standard deviation 3.99. 30 corresponds to z=+3.5 */ static int connection_setup_timeout=200, port=119, try_stream=1; static int inndcomm_flush_timeout=100; @@ -351,13 +376,15 @@ struct InputFile { void *readable_callback_user; int fd; - struct Filemon_Perfile *filemon; + Filemon_Perfile *filemon; oop_read *rd; long inprogress; /* no. of articles read but not processed */ off_t offset; + int skippinglong; int counts[art_MaxState][RCI_max]; + int readcount_ok, readcount_blank, readcount_err; char path[]; }; @@ -411,7 +438,7 @@ static int until_connect; static ConnList conns; static ArticleList queue; -static char *path_lock, *path_flushing, *path_defer; +static char *path_lock, *path_flushing, *path_defer, *globpat_backlog; #define SMS(newstate, periods, why) \ (statemc_setstate(sm_##newstate,(periods),#newstate,(why))) @@ -728,7 +755,7 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) { setnonblock(conn->fd, 1); conn->max_queue= conn->stream ? max_queue_per_conn : 1; LIST_ADDHEAD(conns, conn); - notice("#%d connected %s", conn->fd, conn->stream ? "streaming" : "plain"); + notice("C%d connected %s", conn->fd, conn->stream ? "streaming" : "plain"); connect_attempt_discard(); check_master_queue(); return 0; @@ -738,6 +765,12 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) { connect_attempt_discard(); } +static int allow_connect_start(void) { + return conns.count < max_connections + && !connecting_child + && !until_connect; +} + static void connect_start(void) { assert(!connecting_sockets[0]); assert(!connecting_sockets[1]); @@ -861,8 +894,7 @@ static void check_master_queue(void) { spare--; } conn_maybe_write(use); - } else if (conns.count < max_connections && - !connecting_child && !until_connect) { + } else if (allow_connect_start()) { until_connect= reconnect_delay_periods; connect_start(); break; @@ -921,7 +953,7 @@ static void vconnfail(Conn *conn, const char *fmt, va_list al) { xmit_free(d); char *m= xvasprintf(fmt,al); - warn("#%d connection failed, requeueing " RCI_TRIPLE_FMT_BASE ": %s", + warn("C%d connection failed (requeueing " RCI_TRIPLE_FMT_BASE "): %s", conn->fd, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m); free(m); @@ -1013,8 +1045,8 @@ static void conn_make_some_xmits(Conn *conn) { if (conn->xmitu+5 > CONNIOVS) break; - Article *art= LIST_REMHEAD(priority); - if (!art) art= LIST_REMHEAD(waiting); + Article *art= LIST_REMHEAD(conn->priority); + if (!art) art= LIST_REMHEAD(conn->waiting); if (!art) break; if (art->state >= art_Wanted || (conn->stream && nocheck)) { @@ -1056,7 +1088,7 @@ static void conn_make_some_xmits(Conn *conn) { XMIT_LITERAL("\r\n"); assert(art->state == art_Unchecked); - art->ipf->counts[art->state][RCI_sent]++; + art->ipf->counts[art->state][RC_sent]++; LIST_ADDTAIL(conn->sent, art); } } @@ -1209,7 +1241,7 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_event ev, if (code!=205 && code!=503) { connfail(conn, "peer gave unexpected response to QUIT: %s", sani); } else { - notice("#%d idle connection closed\n"); + notice("C%d idle connection closed\n"); assert(!conn->waiting.count); assert(!conn->priority.count); assert(!conn->sent.count); @@ -1273,7 +1305,7 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_event ev, } - conn_maybe_write(sendon); + conn_maybe_write(conn); check_master_queue(); return OOP_CONTINUE; } @@ -1310,10 +1342,6 @@ static InputFile *open_input_file(const char *path) { InputFile *ipf= xmalloc(sizeof(*ipf) + strlen(path) + 1); memset(ipf,0,sizeof(*ipf)); - ipf->readable.on_readable= tailing_on_readable; - ipf->readable.on_cancel= tailing_on_cancel; - ipf->readable.try_read= tailing_try_read; - ipf->fd= fd; strcpy(ipf->path, path); @@ -1333,97 +1361,110 @@ static void close_input_file(InputFile *ipf) { /*---------- dealing with articles read in the input file ----------*/ -typedef void *feedfile_got_article(oop_source *lp, oop_read *rd, - oop_rd_event ev, const char *errmsg, - int errnoval, - const char *data, size_t recsz, - void *ipf_v) { +static void *feedfile_got_bad_data(InputFile *ipf, off_t offset, + const char *data, const char *how) { + warn("corrupted file: %s, offset %lu: %s: %s", + ipf->path, (unsigned long)offset, how, sanitise(data)); + ipf->readcount_err++; + if (ipf->readcount_err > max_bad_data_initial + + (ipf->readcount_ok+ipf->readcount_blank) / max_bad_data_ratio) + die("too much garbage in input file! (%d errs, %d ok, %d blank)", + ipf->readcount_err, ipf->readcount_ok, ipf->readcount_blank); + return OOP_CONTINUE; +} + +static void *feedfile_read_err(oop_source *lp, oop_read *rd, + oop_rd_event ev, const char *errmsg, + int errnoval, const char *data, size_t recsz, + void *ipf_v) { + InputFile *ipf= ipf_v; + assert(ev == OOP_RD_SYSTEM); + errno= errnoval; + sysdie("error reading input file: %s, offset %lu", + ipf->path, (unsigned long)ipf->offset); +} + +static void *feedfile_got_article(oop_source *lp, oop_read *rd, + oop_rd_event ev, const char *errmsg, + int errnoval, const char *data, size_t recsz, + void *ipf_v) { InputFile *ipf= ipf_v; Article *art; char tokentextbuf[sizeof(TOKEN)*2+3]; if (!data) { feedfile_eof(ipf); return OOP_CONTINUE; } - if (data[0] && data[0]!=' ') { - char *space= strchr(data,' '); - int tokenlen= space-data; - int midlen= (int)recsz-tokenlen-1; - if (midlen < 0) goto bad_data; - - if (tokenlen != sizeof(TOKEN)*2+2) goto bad_data; - memcpy(tokentextbuf, data, tokenlen); - tokentextbuf[tokenlen]= 0; - if (!IsToken(tokentextbuf)) goto bad_data; - - art= xmalloc(sizeof(*art) - 1 + midlen + 1); - art->offset= ipf->offset; - art->blanklen= recsz; - art->midlen= midlen; - art->state= art_Unchecked; - art->ipf= ipf; ipf->inprogress++; - art->token= TextToToken(tokentextbuf); - strcpy(art->messageid, space+1); - LIST_ADDTAIL(queue, art); - } + off_t old_offset= ipf->offset; ipf->offset += recsz + 1; - if (sms==sm_NORMAL && ipf==main_input_file && - ipf->offset >= flush_threshold) - statemc_start_flush("feed file size"); +#define X_BAD_DATA(m) return feedfile_got_bad_data(ipf,old_offset,data,m); - check_master_queue(); -} + if (ev==OOP_RD_PARTREC) + feedfile_got_bad_data(ipf,old_offset,data,"missing final newline"); + /* but process it anyway */ -static void statemc_start_flush(const char *why) { /* Normal => Flushing */ - assert(sms == sm_NORMAL); + if (ipf->skippinglong) { + if (ev==OOP_RD_OK) ipf->skippinglong= 0; /* fine now */ + return; + } + if (ev==OOP_RD_LONG) { + ipf->skippinglong= 1; + X_BAD_DATA("overly long line"); + } - debug("starting flush (%s) (%lu >= %lu) (%d)", - why, - (unsigned long)ipf->offset, (unsigned long)flush_threshold, - sm_period_counter); + if (memchr(data,'\0',recsz)) X_BAD_DATA("nul byte"); + if (!recsz) X_BAD_DATA("empty line"); - int r= link(feedfile, duct_path); - if (r) sysdie("link feedfile %s to flushing file %s", feedfile, - path_duct); - /* => Hardlinked */ + if (data[0]==' ') { + if (strspn(data," ") != recsz) X_BAD_DATA("line partially blanked"); + ipf->readcount_blank++; + return OOP_CONTINUE; + } + + char *space= strchr(data,' '); + int tokenlen= space-data; + int midlen= (int)recsz-tokenlen-1; + if (midlen <= 2) X_BAD_DATA("no room for messageid"); + if (space[1]!='<' || space[midlen]!='>') X_BAD_DATA("invalid messageid"); + + if (tokenlen != sizeof(TOKEN)*2+2) X_BAD_DATA("token wrong length"); + memcpy(tokentextbuf, data, tokenlen); + tokentextbuf[tokenlen]= 0; + if (!IsToken(tokentextbuf)) X_BAD_DATA("token wrong syntax"); + + ipf->readcount_ok++; + + art= xmalloc(sizeof(*art) - 1 + midlen + 1); + art->offset= ipf->offset; + art->blanklen= recsz; + art->midlen= midlen; + art->state= art_Unchecked; + art->ipf= ipf; ipf->inprogress++; + art->token= TextToToken(tokentextbuf); + strcpy(art->messageid, space+1); + LIST_ADDTAIL(queue, art); - xunlink(feedfile, "old feedfile link"); - /* => Moved */ + if (sms==sm_NORMAL && ipf==main_input_file && + ipf->offset >= target_max_feedfile_size) + statemc_start_flush("feed file size"); - spawn_inndcomm_flush(why); /* => Flushing FLUSHING */ + check_master_queue(); + return OOP_CONTINUE; } /*========== tailing input file ==========*/ -static void filemon_start(InputFile *ipf) { - assert(!ipf->filemon); - - ipf->filemon= xmalloc(sizeof(*ipf->filemon)); - memset(ipf->filemon, 0, sizeof(*ipf->filemon)); - filemon_method_startfile(ipf, ipf->filemon); -} - -static void filemon_stop(InputFile *ipf) { - if (!ipf->filemon) return; - filemon_method_stopfile(ipf, ipf->filemon); - free(ipf->filemon); - ipf->filemon= 0; -} - -static void filemon_callback(InputFile *ipf) { - ipf->readable_callback(ipf->readable_callback_user); -} - static void *tailing_rable_call_time(oop_source *loop, struct timeval tv, void *user) { InputFile *ipf= user; - return ipf->readable_callback(ipf->readable_callback_user); + return ipf->readable_callback(loop, &ipf->readable, + ipf->readable_callback_user); } -static void on_cancel(struct oop_readable *rable) { +static void tailing_on_cancel(struct oop_readable *rable) { InputFile *ipf= (void*)rable; - if (ipf->filemon) filemon_stopfile(ipf); + if (ipf->filemon) filemon_stop(ipf); loop->cancel_time(loop, OOP_TIME_NOW, tailing_rable_call_time, ipf); ipf->readable_callback= 0; } @@ -1441,7 +1482,7 @@ static int tailing_on_readable(struct oop_readable *rable, tailing_on_cancel(rable); ipf->readable_callback= cb; ipf->readable_callback_user= user; - filemon_startfile(ipf); + filemon_start(ipf); tailing_queue_readable(ipf); return 0; @@ -1484,9 +1525,9 @@ static int filemon_inotify_fd; static int filemon_inotify_wdmax; static InputFile **filemon_inotify_wd2ipf; -typedef struct Filemon_Perfile { +struct Filemon_Perfile { int wd; -} Filemon_Inotify_Perfile; +}; static void filemon_method_startfile(InputFile *ipf, Filemon_Perfile *pf) { int wd= inotify_add_watch(filemon_inotify_fd, ipf->path, IN_MODIFY); @@ -1551,13 +1592,13 @@ static int filemon_method_init(void) { return 1; } -#endif /* HAVE_INOTIFY && !HAVE_FILEMON *// +#endif /* HAVE_INOTIFY && !HAVE_FILEMON */ /*---------- filemon dummy implementation ----------*/ #if !defined(HAVE_FILEMON) -typedef struct Filemon_Perfile { int dummy; } Filemon_Dummy_Perfile; +struct Filemon_Perfile { int dummy; }; static int filemon_method_init(void) { return 0; } static void filemon_method_startfile(InputFile *ipf, Filemon_Perfile *pf) { } @@ -1565,21 +1606,42 @@ static void filemon_method_stopfile(InputFile *ipf, Filemon_Perfile *pf) { } #endif /* !HAVE_FILEMON */ +/*---------- filemon generic interface ----------*/ + +static void filemon_start(InputFile *ipf) { + assert(!ipf->filemon); + + ipf->filemon= xmalloc(sizeof(*ipf->filemon)); + memset(ipf->filemon, 0, sizeof(*ipf->filemon)); + filemon_method_startfile(ipf, ipf->filemon); +} + +static void filemon_stop(InputFile *ipf) { + if (!ipf->filemon) return; + filemon_method_stopfile(ipf, ipf->filemon); + free(ipf->filemon); + ipf->filemon= 0; +} + +static void filemon_callback(InputFile *ipf) { + ipf->readable_callback(loop, &ipf->readable, ipf->readable_callback_user); +} + /*---------- interface to start and stop an input file ----------*/ static const oop_rd_style feedfile_rdstyle= { OOP_RD_DELIM_STRIP, '\n', - OOP_RD_NUL_FORBID, - OOP_RD_SHORTREC_EOF, + OOP_RD_NUL_PERMIT, + OOP_RD_SHORTREC_LONG, }; static void inputfile_tailing_start(InputFile *ipf) { assert(!ipf->fd); - ipf->readable->on_readable= tailing_on_readable; - ipf->readable->on_cancel= tailing_on_cancel; - ipf->readable->try_read= tailing_try_read; - ipf->readable->delete_tidy= 0; /* we never call oop_rd_delete_{tidy,kill} */ - ipf->readable->delete_kill= 0; + ipf->readable.on_readable= tailing_on_readable; + ipf->readable.on_cancel= tailing_on_cancel; + ipf->readable.try_read= tailing_try_read; + ipf->readable.delete_tidy= 0; /* we never call oop_rd_delete_{tidy,kill} */ + ipf->readable.delete_kill= 0; ipf->readable_callback= 0; ipf->readable_callback_user= 0; @@ -1588,7 +1650,7 @@ static void inputfile_tailing_start(InputFile *ipf) { assert(ipf->fd); int r= oop_rd_read(ipf->rd, &feedfile_rdstyle, MAX_LINE_FEEDFILE, - feedfile_got_article,ipf, feedfile_problem,ipf); + feedfile_got_article,ipf, feedfile_read_err, ipf); if (r) sysdie("unable start reading feedfile %s",ipf->path); } @@ -1702,6 +1764,12 @@ static void inputfile_tailing_stop(InputFile *ipf) { * ->8- */ +static void startup_set_input_file(InputFile *f) { + assert(!main_input_file); + main_input_file= f; + inputfile_tailing_start(f); +} + static void statemc_init(void) { struct stat stab, stabf; @@ -1718,7 +1786,7 @@ static void statemc_init(void) { memset(&fl,0,sizeof(fl)); fl.l_type= F_WRLCK; fl.l_whence= SEEK_SET; - r= fcntl(lockfd, F_SETLK, &fl); + int r= fcntl(lockfd, F_SETLK, &fl); if (r==-1) { if (errno==EACCES || errno==EAGAIN) { if (quiet_multiple) exit(0); @@ -1727,7 +1795,7 @@ static void statemc_init(void) { sysdie("fcntl F_SETLK lockfile %s", path_lock); } - xfstat_isreg(lockfd, &stabf, "lockfile"); + xfstat_isreg(lockfd, &stabf, path_lock, "lockfile"); int lock_noent; xlstat_isreg(path_lock, &stab, &lock_noent, "lockfile"); @@ -1765,7 +1833,7 @@ static void statemc_init(void) { int noent_f; InputFile *file_d= open_input_file(path_flushing); - if (file_d) xfstat_isreg(file_d->fd, &stab_d, "flushing file"); + if (file_d) xfstat_isreg(file_d->fd, &stab_d, path_flushing,"flushing file"); xlstat_isreg(feedfile, &stab_f, &noent_f, "feedfile"); @@ -1787,7 +1855,7 @@ static void statemc_init(void) { SMS(SEPARATED, 0, "found both old and current feed files"); } else { debug("startup: F exists, D ENOENT => Normal"); - FILE *file_f= open_input_file(feedfile); + InputFile *file_f= open_input_file(feedfile); if (!file_f) die("feed file vanished during startup"); startup_set_input_file(file_f); SMS(NORMAL, flushfail_retry_periods, "normal startup"); @@ -1795,6 +1863,26 @@ static void statemc_init(void) { } } +static void statemc_start_flush(const char *why) { /* Normal => Flushing */ + assert(sms == sm_NORMAL); + + debug("starting flush (%s) (%lu >?= %lu) (%d)", + why, + (unsigned long)(main_input_file ? main_input_file->offset : 0), + (unsigned long)target_max_feedfile_size, + sm_period_counter); + + int r= link(feedfile, path_flushing); + if (r) sysdie("link feedfile %s to flushing file %s", + feedfile, path_flushing); + /* => Hardlinked */ + + xunlink(feedfile, "old feedfile link"); + /* => Moved */ + + spawn_inndcomm_flush(why); /* => Flushing FLUSHING */ +} + static void statemc_period_poll(void) { if (!sm_period_counter) return; sm_period_counter--; @@ -1813,12 +1901,6 @@ static void statemc_period_poll(void) { } } -static void startup_set_input_file(InputFile *f) { - assert(!main_input_file); - main_input_file= f; - inputfile_tailing_start(f); -} - static int inputfile_is_done(InputFile *ipf) { if (!ipf) return 0; if (ipf->inprogress) return 0; /* new article in the meantime */ @@ -1830,27 +1912,33 @@ static void notice_processed(InputFile *ipf, const char *what, const char *spec) { #define RCI_NOTHING(x) /* nothing */ #define RCI_TRIPLE_FMT(x) " " #x "=" RCI_TRIPLE_FMT_BASE -#define RCI_TRIPLE_VALS(x) , RCI_TRIPLE_VALS_BASE(ipf->counts, .x) +#define RCI_TRIPLE_VALS(x) , RCI_TRIPLE_VALS_BASE(ipf->counts, [RC_##x]) + +#define CNT(art,rc) (ipf->counts[art_##art][RC_##rc]) - info("processed %s%s offered=%d(ch%d,nc%d) accepted=%d(ch%d+nc%d)" + info("processed %s%s read=%d(+%dbl,+%derr)" + " offered=%d(ch%d,nc%d) accepted=%d(ch%d+nc%d)" RESULT_COUNTS(RCI_NOTHING, RCI_TRIPLE_FMT) , - what,spec, - ipf->counts[art_Unchecked].sent + ipf->counts[art_Unsolicited].sent - , ipf->counts[art_Unchecked].sent, ipf->counts[art_Unsolicited].sent, - ipf->counts[art_Wanted].accepted + ipf->counts[art_Unsolicited].accepted - ,ipf->counts[art_Wanted].accepted,ipf->counts[art_Unsolicited].accepted + what, spec, + ipf->readcount_ok, ipf->readcount_blank, ipf->readcount_err, + CNT(Unchecked,sent) + CNT(Unsolicited,sent) + , CNT(Unchecked,sent), CNT(Unsolicited,sent), + CNT(Wanted,accepted) + CNT(Unsolicited,accepted) + , CNT(Wanted,accepted), CNT(Unsolicited,accepted) RESULT_COUNTS(RCI_NOTHING, RCI_TRIPLE_VALS) ); + +#undef CNT } static void statemc_check_backlog_done(void) { - InputFile *ipf= backlog_input_file(); + InputFile *ipf= backlog_input_file; if (!inputfile_is_done(ipf)) return; - const char *slash= strrchr(ipf->path, "/"); + const char *slash= strrchr(ipf->path, '/'); const char *leaf= slash ? slash+1 : ipf->path; - const char *under= strchr(slash, "_"); + const char *under= strchr(slash, '_'); const char *rest= under ? under+1 : leaf; if (!strncmp(rest,"backlog",7)) rest += 7; notice_processed(ipf,"backlog:",rest); @@ -1942,7 +2030,7 @@ static void open_defer(void) { /* truncate away any half-written records */ - xfstat_isreg(fileno(defer), &stab, "newly opened defer file"); + xfstat_isreg(fileno(defer), &stab, path_defer, "newly opened defer file"); if (stab.st_size > LONG_MAX) die("defer file %s size is far too large", path_defer); @@ -1957,7 +2045,7 @@ static void open_defer(void) { if (fseek(defer, truncto-1, SEEK_SET) < 0) sysdie("seek in defer file %s while truncating partial", path_defer); - r= getc(defer); + int r= getc(defer); if (r==EOF) { if (ferror(defer)) sysdie("failed read from defer file %s", path_defer); @@ -1990,21 +2078,26 @@ static void close_defer(void) { if (!defer) return; - xfstat(fileno(defer), &stab, "defer file"); + xfstat(fileno(defer), &stab, path_defer, "defer file"); if (fclose(defer)) sysfatal("could not close defer file %s", path_defer); defer= 0; + time_t now= time(0); + if (now==-1) sysdie("time(2) failed"); + char *backlog= xasprintf("%s_backlog_%lu.%lu", feedfile, - (unsigned long)now.tv_sec, + (unsigned long)now, (unsigned long)stab.st_ino); - if (link(path_defer, path_backlog)) + if (link(path_defer, backlog)) sysfatal("could not install defer file %s as backlog file %s", path_defer, backlog); if (unlink(path_defer)) sysdie("could not unlink old defer link %s to backlog file %s", path_defer, backlog); + free(backlog); + if (until_backlog_nextscan < 0 || until_backlog_nextscan > backlog_retry_minperiods + 1) until_backlog_nextscan= backlog_retry_minperiods + 1;