Fixed outbound queue to send mail to nodes not in the setup
This commit is contained in:
parent
c71ca269b8
commit
92d5e5464b
@ -62,6 +62,7 @@ v0.35.03 06-Jul-2002
|
|||||||
There are people using M$ wordprocessors to create TIC files,
|
There are people using M$ wordprocessors to create TIC files,
|
||||||
there is now better filtering to get that garbage out of the
|
there is now better filtering to get that garbage out of the
|
||||||
received tic files. We will forward plain ascii of course.
|
received tic files. We will forward plain ascii of course.
|
||||||
|
Fixed the outbound queue to send to nodes not in the setup.
|
||||||
|
|
||||||
newuser:
|
newuser:
|
||||||
Check for Unix accounts is now case sensitive.
|
Check for Unix accounts is now case sensitive.
|
||||||
|
@ -90,6 +90,7 @@ int do_learn = FALSE; /* News articles learnmode */
|
|||||||
int check_crc = TRUE; /* Check .tic crc values */
|
int check_crc = TRUE; /* Check .tic crc values */
|
||||||
int check_dupe = TRUE; /* Check duplicates */
|
int check_dupe = TRUE; /* Check duplicates */
|
||||||
int do_flush = FALSE; /* Flush outbound queue */
|
int do_flush = FALSE; /* Flush outbound queue */
|
||||||
|
int flushed = FALSE; /* If anything was flushed */
|
||||||
extern int do_quiet; /* Quiet flag */
|
extern int do_quiet; /* Quiet flag */
|
||||||
extern int e_pid; /* Pid of child process */
|
extern int e_pid; /* Pid of child process */
|
||||||
extern int show_log; /* Show logging on screen */
|
extern int show_log; /* Show logging on screen */
|
||||||
@ -215,7 +216,7 @@ void die(int onsig)
|
|||||||
if (echo_imp + net_imp + net_out + echo_out)
|
if (echo_imp + net_imp + net_out + echo_out)
|
||||||
CreateSema((char *)"msglink");
|
CreateSema((char *)"msglink");
|
||||||
|
|
||||||
if (echo_out + net_out + tic_out)
|
if ((echo_out + net_out + tic_out) || flushed)
|
||||||
CreateSema((char *)"scanout");
|
CreateSema((char *)"scanout");
|
||||||
|
|
||||||
if (tic_imp)
|
if (tic_imp)
|
||||||
|
@ -48,6 +48,8 @@ static char *dow[] = {(char *)"su", (char *)"mo", (char *)"tu", (char *)"we",
|
|||||||
|
|
||||||
|
|
||||||
extern int do_quiet;
|
extern int do_quiet;
|
||||||
|
extern int flushed;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -98,11 +100,16 @@ void flush_dir(char *ndir)
|
|||||||
sprintf(nodenr.domain, "%s", noden.domain);
|
sprintf(nodenr.domain, "%s", noden.domain);
|
||||||
|
|
||||||
if (!SearchNode(nodenr)) {
|
if (!SearchNode(nodenr)) {
|
||||||
WriteError("Downlink %s not found", aka2str(nodenr));
|
/*
|
||||||
if (noden.domain)
|
* Node not known, blank noderecord and fill in some details
|
||||||
free(noden.domain);
|
* so that we are able to send mail crash or immediate.
|
||||||
free(temp);
|
*/
|
||||||
return;
|
Syslog('+', "Node %s not in setup, using default settings", aka2str(nodenr));
|
||||||
|
memset(&nodes, 0, sizeof(nodes));
|
||||||
|
nodes.Aka[0].zone = noden.zone;
|
||||||
|
nodes.Aka[0].net = noden.net;
|
||||||
|
nodes.Aka[0].node = noden.node;
|
||||||
|
nodes.Aka[0].point = noden.point;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -351,6 +358,7 @@ void flush_dir(char *ndir)
|
|||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
}
|
}
|
||||||
first = FALSE;
|
first = FALSE;
|
||||||
|
flushed = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (execute(archiver.marc, arcfile, fname, (char *)"/dev/null", (char *)"/dev/null", (char *)"/dev/null") == 0) {
|
if (execute(archiver.marc, arcfile, fname, (char *)"/dev/null", (char *)"/dev/null", (char *)"/dev/null") == 0) {
|
||||||
@ -419,6 +427,7 @@ void flush_dir(char *ndir)
|
|||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
}
|
}
|
||||||
first = FALSE;
|
first = FALSE;
|
||||||
|
flushed = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(pktfile, "%s/%s", temp, fname);
|
sprintf(pktfile, "%s/%s", temp, fname);
|
||||||
@ -500,6 +509,7 @@ void flush_dir(char *ndir)
|
|||||||
if (!do_quiet) {
|
if (!do_quiet) {
|
||||||
printf("\rAdding files for %s ", ascfnode(&noden, 0x1f));
|
printf("\rAdding files for %s ", ascfnode(&noden, 0x1f));
|
||||||
fflush(stdout);
|
fflush(stdout);
|
||||||
|
flushed = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
buf = calloc(PATH_MAX + 1, sizeof(char));
|
buf = calloc(PATH_MAX + 1, sizeof(char));
|
||||||
|
Reference in New Issue
Block a user