fidogate-cvs Mailing List for FIDOGATE (Page 8)

Update of /cvsroot/fidogate/fidogate/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31647/test

Modified Files:
	Makefile 
Log Message:
See ChangeLog

Index: Makefile
===================================================================
RCS file: /cvsroot/fidogate/fidogate/test/Makefile,v
retrieving revision 4.10
retrieving revision 4.11
diff -u -d -r4.10 -r4.11
--- Makefile	4 Aug 2002 03:12:18 -0000	4.10
+++ Makefile	22 Aug 2004 10:30:04 -0000	4.11
@@ -31,7 +31,7 @@
 clean veryclean::
 	rm -f *~ *.bak *.o tags TAGS core paths.tmp
 
-verify::
+test verify::
 	@for d in tc.*; do \
 	  if [ -f $$d/run.verify ]; then \
 	    (cd $$d; ../tr.verify $$d) \

Update of /cvsroot/fidogate/fidogate/src/toss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31647/src/toss

Modified Files:
	ftn2ftn.c ftnexpire.c ftnpack.c ftnroute.c ftntoss.c history.c 
Log Message:
See ChangeLog

Index: ftntoss.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/toss/ftntoss.c,v
retrieving revision 4.42
retrieving revision 4.43
diff -u -d -r4.42 -r4.43
--- ftntoss.c	16 Feb 2003 15:39:02 -0000	4.42
+++ ftntoss.c	22 Aug 2004 10:30:03 -0000	4.43
@@ -811,7 +811,7 @@
     if( (area = areasbbs_lookup(buffer)) == NULL )
     {
 	/* Unknown area */
-	log("unknown area %s from %s", buffer, znfp1(&msg->node_from) );
+	logit("unknown area %s from %s", buffer, znfp1(&msg->node_from) );
 	msgs_unknown++;
 	if(!kill_unknown)
 	    return do_bad_msg(msg, body);
@@ -852,7 +852,7 @@
 	    /* If KillNoMSGID ... */
 	    if(kill_nomsgid)
 	    {
-		log("no ^AMSGID treated as dupe from %s: %s",
+		logit("no ^AMSGID treated as dupe from %s: %s",
 		    znfp1(&msg->node_from), area->area);
 		msgs_dupe++;
 		if(!kill_dupe)
@@ -863,7 +863,7 @@
 	    /* No ^AMSGID, use sender, date and checksum */
 	    if(msg_parse_origin(body->origin, &msg->node_orig) == ERROR)
 	    {
-		log("invalid * Origin treated as dupe from %s: %s",
+		logit("invalid * Origin treated as dupe from %s: %s",
 		    znfp1(&msg->node_from), area->area);
 		msgs_dupe++;
 		if(!kill_dupe)
@@ -888,7 +888,7 @@
 	{
 	    if(msg->date < exp_sec)
 	    {
-		log("message too old, treated as dupe: %s origin %s date %s",
+		logit("message too old, treated as dupe: %s origin %s date %s",
 		    area->area, znfp1(&msg->node_orig),
 		    date(DATE_FTS_0001, &msg->date)                          );
 		msgs_dupe++;
@@ -902,7 +902,7 @@
 	if(hi_test(msgid))
 	{
 	    /* Dupe! */
-	    log("dupe from %s: %s", znfp1(&msg->node_from), msgid);
+	    logit("dupe from %s: %s", znfp1(&msg->node_from), msgid);
 	    msgs_dupe++;
 	    if(!kill_dupe)
 		return do_bad_msg(msg, body);
@@ -933,7 +933,7 @@
 	   ! is_local_addr(&msg->node_to, FALSE)   )
 	{
 	    /* Routed EchoMail */
-	    log("routed echomail area %s from %s to %s", area->area,
+	    logit("routed echomail area %s from %s to %s", area->area,
 		znfp1(&msg->node_from),
 		znfp2(&msg->node_to)                    );
 	    msgs_routed++;
@@ -952,7 +952,7 @@
 	    ! lon_search(&area->nodes, &msg->node_from)   )
 	{
 	    /* Insecure EchoMail */
-	    log("insecure echomail area %s from %s", area->area,
+	    logit("insecure echomail area %s from %s", area->area,
 		znfp1(&msg->node_from)              );
 	    msgs_insecure++;
 	    if(!kill_insecure)
@@ -1033,7 +1033,7 @@
     if(check_path && do_check_path(&path)==ERROR)
     {
 	    /* Circular ^APATH EchoMail */
-	    log("circular path echomail area %s from %s to %s",
+	    logit("circular path echomail area %s from %s to %s",
 		area->area, znfp1(&msg->node_from),
 		znfp2(&msg->node_to)                 );
 	    msgs_path++;
@@ -1115,7 +1115,7 @@
 	{
 	    node = msg->node_from;
 	    change_addr(&msg->node_from, &r->to);
-	    log("rewrite: %s -> %s",
+	    logit("rewrite: %s -> %s",
 		znfp1(&node), znfp2(&msg->node_from) );
 	    break;
 	}
@@ -1126,7 +1126,7 @@
 	{
 	    node = msg->node_to;
 	    change_addr(&msg->node_to, &r->to);
-	    log("rewrite: %s -> %s",
+	    logit("rewrite: %s -> %s",
 		znfp1(&node), znfp2(&msg->node_to) );
 	    break;
 	}
@@ -1166,11 +1166,11 @@
 	    if(! node_eq(&node, &msg->node_to))
 	    {
 		if(r->type == CMD_REMAP_TO)
-		    log("remapto: %s @ %s -> %s", msg->name_to,
+		    logit("remapto: %s @ %s -> %s", msg->name_to,
 			znfp1(&node),
 			!kill ? znfp2(&msg->node_to) : "KILLED");
 		else
-		    log("remapfrom: %s @ %s -> %s", msg->name_from,
+		    logit("remapfrom: %s @ %s -> %s", msg->name_from,
 			znfp1(&msg->node_from),
 			!kill ? znfp2(&msg->node_to) : "KILLED");
 	    }
@@ -1218,7 +1218,7 @@
 
 
     if(log_netmail)
-	log("MAIL: %s @ %s -> %s @ %s",
+	logit("MAIL: %s @ %s -> %s @ %s",
 	    msg->name_from, znfp1(&msg->node_from),
 	    msg->name_to  , znfp2(&msg->node_to) );
 
@@ -1227,7 +1227,7 @@
      */
     if(msg->attr & MSG_FILE)
     {
-	log("file attach %s", msg->subject);
+	logit("file attach %s", msg->subject);
     }
     
     /*
@@ -1237,7 +1237,7 @@
     {
 	if( is_local_addr(&msg->node_to, FALSE) )
 	{
-	    log("killing empty msg from %s @ %s",
+	    logit("killing empty msg from %s @ %s",
 		msg->name_from, znfp1(&msg->node_from));
 	    msgs_empty++;
 	    
@@ -1321,11 +1321,11 @@
     {
 	if(feof(pkt_file))
 	{
-	    log("WARNING: premature EOF reading input packet");
+	    logit("WARNING: premature EOF reading input packet");
 	    TMPS_RETURN(OK);
 	}
 	
-	log("ERROR: reading input packet");
+	logit("ERROR: reading input packet");
 	TMPS_RETURN(ERROR);
     }
 
@@ -1338,7 +1338,7 @@
 	msg.node_to   = pkt->to;
 	if(pkt_get_msg_hdr(pkt_file, &msg) == ERROR)
 	{
-	    log("ERROR: reading input packet");
+	    logit("ERROR: reading input packet");
 	    TMPS_RETURN(ERROR);
 	}
 	
@@ -1350,11 +1350,11 @@
 	{
 	    if(feof(pkt_file))
 	    {
-		log("WARNING: premature EOF reading input packet");
+		logit("WARNING: premature EOF reading input packet");
 	    }
 	    else
 	    {
-		log("ERROR: reading input packet");
+		logit("ERROR: reading input packet");
 		TMPS_RETURN(ERROR);
 	    }
 	}
@@ -1365,7 +1365,7 @@
 	 * Parse message body
 	 */
 	if( msg_body_parse(&tl, &body) == -2 )
-	    log("ERROR: parsing message body");
+	    logit("ERROR: parsing message body");
 	/* Retrieve address information from kludges for NetMail */
 	if(body.area == NULL)
 	{
@@ -1447,13 +1447,13 @@
     /* Open packet and read header */
     pkt_file = fopen(pkt_name, R_MODE);
     if(!pkt_file) {
-	log("$ERROR: can't open packet %s", pkt_name);
+	logit("$ERROR: can't open packet %s", pkt_name);
 	rename_bad(pkt_name);
 	TMPS_RETURN(OK);
     }
     if(pkt_get_hdr(pkt_file, &pkt) == ERROR)
     {
-	log("ERROR: reading header from %s", pkt_name);
+	logit("ERROR: reading header from %s", pkt_name);
 	fclose(pkt_file);
 	rename_bad(pkt_name);
 	TMPS_RETURN(OK);
@@ -1461,14 +1461,14 @@
     
     /* Unpack it */
     pkt_size = check_size(pkt_name);
-    log("packet %s (%ldb) from %s to %s", pkt_name, pkt_size,
+    logit("packet %s (%ldb) from %s to %s", pkt_name, pkt_size,
 	znfp1(&pkt.from), znfp2(&pkt.to) );
     pkts_in++;
     pkts_bytes += pkt_size;
     
     if(unpack(pkt_file, &pkt) == ERROR) 
     {
-	log("ERROR: processing %s", pkt_name);
+	logit("ERROR: processing %s", pkt_name);
 	fclose(pkt_file);
 	rename_bad(pkt_name);
 	TMPS_RETURN(severe_error);
@@ -1477,7 +1477,7 @@
     fclose(pkt_file);
 
     if (unlink(pkt_name)) {
-	log("$ERROR: can't unlink %s", pkt_name);
+	logit("$ERROR: can't unlink %s", pkt_name);
 	rename_bad(pkt_name);
 	TMPS_RETURN(ERROR);
     }
@@ -1508,7 +1508,7 @@
 	name = "";            break;
     }
 
-    log("KILLED%s: exit forced", name);
+    logit("KILLED%s: exit forced", name);
 }
 
 
@@ -1839,7 +1839,7 @@
 	dir_sortmode(DIR_SORTMTIME);
 	if(dir_open(in_dir, "*.pkt", TRUE) == ERROR)
 	{
-	    log("$ERROR: can't open directory %s", in_dir);
+	    logit("$ERROR: can't open directory %s", in_dir);
 	    exit(EX_OSERR);
 	}
     
@@ -1945,25 +1945,25 @@
 	toss_delta = 1;
     
     if(pkts_in)
-	log("pkts processed: %ld, %ld Kbyte in %ld s, %.2f Kbyte/s",
+	logit("pkts processed: %ld, %ld Kbyte in %ld s, %.2f Kbyte/s",
 	    pkts_in, pkts_bytes/1024, toss_delta,
 	    (double)pkts_bytes/1024./toss_delta                      );
     
     if(msgs_in)
     {
-	log("msgs processed: %ld in, %ld out (%ld mail, %ld echo)",
+	logit("msgs processed: %ld in, %ld out (%ld mail, %ld echo)",
 	    msgs_in, msgs_netmail+msgs_echomail, msgs_netmail, msgs_echomail);
-	log("msgs processed: %ld in %ld s, %.2f msgs/s",
+	logit("msgs processed: %ld in %ld s, %.2f msgs/s",
 	    msgs_in, toss_delta, (double)msgs_in/toss_delta);
     }
     
     if(msgs_unknown || msgs_routed || msgs_insecure || msgs_empty)
-	log("msgs killed:    %ld empty, %ld unknown, %ld routed, %ld insecure",
+	logit("msgs killed:    %ld empty, %ld unknown, %ld routed, %ld insecure",
 	    msgs_empty, msgs_unknown, msgs_routed, msgs_insecure             );
     if(dupe_check && msgs_dupe)
-	log("msgs killed:    %ld dupe", msgs_dupe);
+	logit("msgs killed:    %ld dupe", msgs_dupe);
     if(check_path && msgs_path)
-	log("msgs killed:    %ld circular path", msgs_path);
+	logit("msgs killed:    %ld circular path", msgs_path);
     
     exit(ret);
 }

Index: history.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/toss/history.c,v
retrieving revision 4.12
retrieving revision 4.13
diff -u -d -r4.12 -r4.13
--- history.c	16 Feb 2003 15:39:02 -0000	4.12
+++ history.c	22 Aug 2004 10:30:03 -0000	4.13
@@ -57,11 +57,11 @@
 	/* Doesn't exist, create */
 	if( (fp = fopen(buffer, W_MODE)) == NULL )
 	{
-	    log("$ERROR: creating MSGID history %s failed", buffer);
+	    logit("$ERROR: creating MSGID history %s failed", buffer);
 	    return ERROR;
 	}
 	else
-	    log("creating MSGID history %s", buffer);
+	    logit("creating MSGID history %s", buffer);
     }
     
     BUF_EXPAND(buffer, cf_p_history());
@@ -71,18 +71,18 @@
 	/* Doesn't exist, create */
 	if( (fp = fopen(buffer, W_MODE)) == NULL )
 	{
-	    log("$ERROR: creating MSGID history %s failed", buffer);
+	    logit("$ERROR: creating MSGID history %s failed", buffer);
 	    return ERROR;
 	}
 	else
-	    log("creating MSGID history %s", buffer);
+	    logit("creating MSGID history %s", buffer);
     }
 
     /* Open the history text file */
     BUF_EXPAND(buffer, cf_p_history());
     if( (hi_file = fopen(buffer, A_MODE)) == NULL ) 
     {
-	log("$ERROR: open MSGID history %s failed", buffer);
+	logit("$ERROR: open MSGID history %s failed", buffer);
 	return ERROR;
     }
 
@@ -90,7 +90,7 @@
     dbzincore(1);
     /**dbzwritethrough(1);**/
     if (dbminit(buffer) < 0) {
-	log("$ERROR: dbminit %s failed", buffer);
+	logit("$ERROR: dbminit %s failed", buffer);
 	return ERROR;
     }
 
@@ -111,18 +111,18 @@
     {
 	if(fclose(hi_file) == ERROR) 
 	{
-	    log("$ERROR: close MSGID history failed");
+	    logit("$ERROR: close MSGID history failed");
 	    ret = ERROR;
 	}
 
 	if (dbzsync())
 	{
-	    log("$ERROR: dbzsync MSGID history failed");
+	    logit("$ERROR: dbzsync MSGID history failed");
 	    ret = ERROR;
 	}
 	if (dbmclose() < 0)
 	{
-	    log("$ERROR: dbmclose MSGID history failed");
+	    logit("$ERROR: dbmclose MSGID history failed");
 	    ret = ERROR;
 	}
 
@@ -146,7 +146,7 @@
     /* Get offset in history text file */
     if( (offset = ftell(hi_file)) == ERROR)
     {
-	log("$ERROR: ftell MSGID history failed");
+	logit("$ERROR: ftell MSGID history failed");
 	return ERROR;
     }
 
@@ -155,7 +155,7 @@
     ret = fprintf(hi_file, "%s\t%ld\n", msgid, t);
     if (ret == ERROR || fflush(hi_file) == ERROR)
     {
-	log("$ERROR: write to MSGID history failed");
+	logit("$ERROR: write to MSGID history failed");
 	return ERROR;
     }
 
@@ -165,7 +165,7 @@
     val.dptr  = (char *)&offset;		/* Value */
     val.dsize = sizeof offset;
     if (dbzstore(key, val) < 0) {
-	log("ERROR: dbzstore of record for MSGID history failed");
+	logit("ERROR: dbzstore of record for MSGID history failed");
 	return ERROR;
     }
 

Index: ftnpack.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/toss/ftnpack.c,v
retrieving revision 4.31
retrieving revision 4.32
diff -u -d -r4.31 -r4.32
--- ftnpack.c	16 Feb 2003 15:39:02 -0000	4.31
+++ ftnpack.c	22 Aug 2004 10:30:03 -0000	4.32
@@ -162,7 +162,7 @@
     prog = xstrtok(NULL, " \t");
     if(!name || !prog)
     {
-	log("packing: missing argument for arc/prog definition");
+	logit("packing: missing argument for arc/prog definition");
 	return;
     }
     
@@ -210,7 +210,7 @@
     }
     if((cmd = parse_pack(p)) == ERROR)
     {
-	log("packing: unknown command %s", p);
+	logit("packing: unknown command %s", p);
 	return NULL;
     }
 
@@ -227,7 +227,7 @@
 	p = xstrtok(NULL, " \t");
 	if(!p)
 	{
-	    log("packing: directory argument missing");
+	    logit("packing: directory argument missing");
 	    return NULL;
 	}
 	dir = strsave(p);
@@ -241,12 +241,12 @@
 	p = xstrtok(NULL, " \t");
 	if(!p)
 	{
-	    log("packing: archiver name argument missing");
+	    logit("packing: archiver name argument missing");
 	    return NULL;
 	}
 	if((a = parse_arc(p)) == NULL)
 	{
-	    log("packing: unknown archiver/program %s", p);
+	    logit("packing: unknown archiver/program %s", p);
 	    return NULL;
 	}
     }
@@ -261,14 +261,14 @@
     p = xstrtok(NULL, " \t");
     if(!p)
     {
-	log("packing: node address argument missing");
+	logit("packing: node address argument missing");
 	return NULL;
     }
     while(p)
     {
 	if(znfp_parse_diff(p, &node, &old) == ERROR)
 	{
-	    log("packing: illegal node address %s", p);
+	    logit("packing: illegal node address %s", p);
 	}
 	else
 	{
@@ -456,7 +456,7 @@
 	{
 	    if( (size = check_size(name)) == ERROR )
 	    {
-		log("$ERROR: can't stat %s", name);
+		logit("$ERROR: can't stat %s", name);
 		continue;
 	    }
 	    if(size == 0)			/* Empty archive */
@@ -464,7 +464,7 @@
 		is_old = check_old(name, 24*60*60L);/* > 24 h */
 
 		if(unlink(name) == ERROR)
-		    log("$ERROR: can't remove %s", name);
+		    logit("$ERROR: can't remove %s", name);
 		debug(4, "Removed %s", name);
 		if(is_old)
 		    continue;
@@ -508,7 +508,7 @@
     
     if(bink_mkdir(arcnode) == ERROR)
     {
-	log("ERROR: can't create outbound dir");
+	logit("ERROR: can't create outbound dir");
 	return ERROR;
     }
     
@@ -527,7 +527,7 @@
 	    /* Simply rename */
 	    if(rename(name, pktn) == -1)
 	    {
-		log("$ERROR: rename %s -> %s failed", name, pktn);
+		logit("$ERROR: rename %s -> %s failed", name, pktn);
 		return ERROR;
 	    }
 	}
@@ -536,7 +536,7 @@
 	    /* Copy and process file attaches */
 	    if(do_noarc(name, flonode, desc, file, pktn) == ERROR)
 	    {
-		log("ERROR: copying/processing %s -> %s failed", name, pktn);
+		logit("ERROR: copying/processing %s -> %s failed", name, pktn);
 		return ERROR;
 	    }
 	}
@@ -549,12 +549,12 @@
     chmod(arcn, PACKET_MODE);
     if(ret)
     {
-	log("ERROR: %s failed, exit code=%d", buffer, ret);
+	logit("ERROR: %s failed, exit code=%d", buffer, ret);
 	return ERROR;
     }
     chmod(arcn, PACKET_MODE);
     if(unlink(pktn) == -1)
-	log("$ERROR: can't remove %s", pktn);
+	logit("$ERROR: can't remove %s", pktn);
     if(!dir)
 	return bink_attach(flonode, '#', arcn,
 			   flav_to_asc(desc->flav), FALSE );
@@ -586,7 +586,7 @@
 	     : pkt_open(NULL, &desc->to, flav_to_asc(desc->flav), FALSE);
     if(fp == NULL)
     {
-	log("ERROR: can't open outbound packet for %s",
+	logit("ERROR: can't open outbound packet for %s",
 	    znfp1(&desc->to)      );
 	fclose(pkt_file);
 	TMPS_RETURN(ERROR);
@@ -605,7 +605,7 @@
 	node_clear(&msg.node_to);
 	if(pkt_get_msg_hdr(pkt_file, &msg) != OK)
 	{
-	    log("$ERROR reading input packet %s", name);
+	    logit("$ERROR reading input packet %s", name);
 	    pkt_close();
 	    fclose(pkt_file);
 	    TMPS_RETURN(ERROR);
@@ -614,7 +614,7 @@
 	type = pkt_get_body(pkt_file, &tl);
 	if(type == ERROR)
 	{
-	    log("$ERROR: reading input packet %s", name);
+	    logit("$ERROR: reading input packet %s", name);
 	    pkt_close();
 	    fclose(pkt_file);
 	    TMPS_RETURN(ERROR);
@@ -635,10 +635,10 @@
 		    ret = bink_attach(flonode, 0, fa_name,
 				      flav_to_asc(desc->flav), FALSE );
 		    if(ret == ERROR)
-			log("ERROR: file attach %s for %s failed",
+			logit("ERROR: file attach %s for %s failed",
 			    fa_name, znfp1(&desc->to));
 		    else
-			log("file attach %s (%ldb) for %s",
+			logit("file attach %s (%ldb) for %s",
 			    fa_name, sz, znfp1(&desc->to));
 	    }
 	    /* File attachments from inbound directory */
@@ -651,23 +651,23 @@
 		    ret = bink_attach(flonode, '^', buffer,
 				      flav_to_asc(desc->flav), FALSE );
 		    if(ret == ERROR)
-			log("ERROR: file attach %s for %s failed",
+			logit("ERROR: file attach %s for %s failed",
 			    msg.subject, znfp1(&desc->to));
 		    else
-			log("file attach %s (%ldb) for %s",
+			logit("file attach %s (%ldb) for %s",
 			    msg.subject, sz, znfp1(&desc->to));
 		}
 		else
-		    log("file attach %s: no such file", msg.subject);
+		    logit("file attach %s: no such file", msg.subject);
 	    }
 	    else
-		log("file attach %s not processed, no -F option", fa_name);
+		logit("file attach %s not processed, no -F option", fa_name);
 	}
 
 	/* Write message header */
 	if( pkt_put_msg_hdr(fp, &msg, FALSE) != OK )
 	{
-	    log("$ERROR: writing packet %s", pkt_name());
+	    logit("$ERROR: writing packet %s", pkt_name());
 	    pkt_close();
 	    fclose(pkt_file);
 	    TMPS_RETURN(ERROR);
@@ -678,7 +678,7 @@
 	putc(0, fp);
 	if(ferror(fp) != OK)
 	{
-	    log("$ERROR: writing packet %s", pkt_name());
+	    logit("$ERROR: writing packet %s", pkt_name());
 	    pkt_close();
 	    fclose(pkt_file);
 	    TMPS_RETURN(ERROR);
@@ -690,12 +690,12 @@
     fclose(pkt_file);
     if(pkt_close() != OK)
     {
-	log("$ERROR: can't close outbound packet");
+	logit("$ERROR: can't close outbound packet");
 	TMPS_RETURN(ERROR);
     }
     if(unlink(name) != OK)
     {
-	log("$ERROR: can't remove packet %s", name);
+	logit("$ERROR: can't remove packet %s", name);
 	TMPS_RETURN(ERROR);
     }
     
@@ -719,12 +719,12 @@
     debug(4, "Exit code=%d", ret);
     if(ret)
     {
-        log("ERROR: %s failed, exit code=%d", buffer, ret);
+        logit("ERROR: %s failed, exit code=%d", buffer, ret);
         return ERROR;
     }
     if(pack->arc->pack != PACK_PROGN)
 	if(unlink(name)==ERROR)
-	    log("$ERROR: can't remove %s", name);
+	    logit("$ERROR: can't remove %s", name);
 
     return OK;
 }
@@ -803,17 +803,17 @@
 	    (desc->flav!=FLAV_CRASH && pack->arc->prog) )
 	{
 	    if(pack->pack == PACK_ROUTE)
-		log("archiving packet (%ldb) for %s via %s arc (%s)",
+		logit("archiving packet (%ldb) for %s via %s arc (%s)",
 		    check_size(name),
 		    znfp1(&desc->to), znfp2(&arcnode),
 		    pack->arc->name );
 	    else if(pack->pack == PACK_FLO)
-		log("archiving packet (%ldb) for %s via %s flo (%s)",
+		logit("archiving packet (%ldb) for %s via %s flo (%s)",
 		    check_size(name),
 		    znfp1(&desc->to), znfp2(&flonode),
 		    pack->arc->name );
 	    else
-		log("archiving packet (%ldb) for %s (%s)",
+		logit("archiving packet (%ldb) for %s (%s)",
 		    check_size(name),
 		    znfp1(&desc->to), pack->arc->name );
 
@@ -822,7 +822,7 @@
 	}
 	else
 	{
-	    log("packet (%ldb) for %s (noarc)",
+	    logit("packet (%ldb) for %s (noarc)",
 		check_size(name), znfp1(&desc->to));
 	    ret = do_noarc(name, &desc->to, desc, file, NULL);
 	}
@@ -831,7 +831,7 @@
     {
 	if(file)
 	    fclose(file);
-	log("packet (%ldb) for %s (%s)",
+	logit("packet (%ldb) for %s (%s)",
 	    check_size(name), znfp1(&desc->to), pack->arc->name);
 	ret = do_prog(name, desc, pack);
     }
@@ -878,7 +878,7 @@
     {
 	if(pack->arc->prog)
 	{
-	    log("archiving packet (%ldb) for %s (%s) in %s",
+	    logit("archiving packet (%ldb) for %s (%s) in %s",
 		check_size(name), znfp1(&desc->to), pack->arc->name, pack->dir);
 
 	    ret = do_arcmail(name, &arcnode, &flonode, desc,
@@ -889,7 +889,7 @@
     /* dirmove */
     if(pack->pack==PACK_MOVE)
     {
-	log("moving packet (%ldb) for %s to %s",
+	logit("moving packet (%ldb) for %s to %s",
 	    check_size(name), znfp1(&desc->to), pack->dir);
 
 	pktn = packing_pkt_name(pack->dir, name);
@@ -980,12 +980,12 @@
 	/* Open packet and read header */
 	pkt_file = fopen(pkt_name, R_MODE);
 	if(!pkt_file) {
-	    log("$ERROR: can't open packet %s", pkt_name);
+	    logit("$ERROR: can't open packet %s", pkt_name);
 	    TMPS_RETURN(severe_error);
 	}
 	if(pkt_get_hdr(pkt_file, &pkt) == ERROR)
 	{
-	    log("ERROR: reading header from %s", pkt_name);
+	    logit("ERROR: reading header from %s", pkt_name);
 	    TMPS_RETURN(severe_error);
 	}
     }
@@ -993,7 +993,7 @@
     /* Pack it */
     if(do_packing(pkt_name, pkt_file, &pkt) == ERROR) 
     {
-	log("ERROR: processing %s", pkt_name);
+	logit("ERROR: processing %s", pkt_name);
 	TMPS_RETURN(severe_error);
     }
 
@@ -1023,7 +1023,7 @@
 	name = "";            break;
     }
 
-    log("KILLED%s: exit forced", name);
+    logit("KILLED%s: exit forced", name);
 }
 
 
@@ -1244,7 +1244,7 @@
 	dir_sortmode(DIR_SORTMTIME);
 	if(dir_open(in_dir, pattern, TRUE) == ERROR)
 	{
-	    log("$ERROR: can't open directory %s", in_dir);
+	    logit("$ERROR: can't open directory %s", in_dir);
 	    ret = EX_OSERR;
 	}
 	else 

Index: ftnroute.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/toss/ftnroute.c,v
retrieving revision 4.30
retrieving revision 4.31
diff -u -d -r4.30 -r4.31
--- ftnroute.c	16 Feb 2003 15:39:02 -0000	4.30
+++ ftnroute.c	22 Aug 2004 10:30:03 -0000	4.31
@@ -121,10 +121,10 @@
 
 
     if(node_eq(&desc->to, &pkt->to))
-	log("packet for %s (%s)", znfp1(&pkt->to),
+	logit("packet for %s (%s)", znfp1(&pkt->to),
 	    flav_to_asc(desc->flav)                              );
     else
-	log("packet for %s via %s (%s)", znfp1(&pkt->to),
+	logit("packet for %s via %s (%s)", znfp1(&pkt->to),
 	    znfp2(&desc->to), flav_to_asc(desc->flav)     );
 
     return desc->move_only ? do_move(name, fp, desc)
@@ -149,7 +149,7 @@
     debug(5, "Rename %s -> %s", name, buffer);
     if(rename(name, buffer) == ERROR)
     {
-	log("$ERROR: can't rename %s -> %s", name, buffer);
+	logit("$ERROR: can't rename %s -> %s", name, buffer);
 	return ERROR;
     }
 
@@ -157,7 +157,7 @@
     if(utime(buffer, NULL) == ERROR)
     {
 #ifndef __CYGWIN32__		/* Some problems with utime() here */
-	log("$WARNING: can't set time of %s", buffer);
+	logit("$WARNING: can't set time of %s", buffer);
 #endif
 #if 0
 	return ERROR;
@@ -339,7 +339,7 @@
 	msg.node_to   = pkt->to;
 	if(pkt_get_msg_hdr(pkt_file, &msg) == ERROR)
 	{
-	    log("ERROR: reading input packet");
+	    logit("ERROR: reading input packet");
 	    ret = ERROR;
 	    break;
 	}
@@ -350,7 +350,7 @@
 	type = pkt_get_body(pkt_file, &tl);
 	if(type == ERROR)
 	{
-	    log("ERROR: reading input packet");
+	    logit("ERROR: reading input packet");
 	    ret = ERROR;
 	    break;
 	}
@@ -359,7 +359,7 @@
 	 * Parse message body
 	 */
 	if( msg_body_parse(&tl, &body) == -2 )
-	    log("ERROR: parsing message body");
+	    logit("ERROR: parsing message body");
 
 	if(body.area == NULL)
 	{
@@ -413,13 +413,13 @@
 
     if(fclose(pkt_file) == ERROR)
     {
-	log("$ERROR: can't close packet %s", pkt_name);
+	logit("$ERROR: can't close packet %s", pkt_name);
 	TMPS_RETURN(severe_error=ERROR);
     }
 
     if(ret == OK)
 	if (unlink(pkt_name)) {
-	    log("$ERROR: can't unlink packet %s", pkt_name);
+	    logit("$ERROR: can't unlink packet %s", pkt_name);
 	    TMPS_RETURN(ERROR);
 	}
 
@@ -441,12 +441,12 @@
      */
     pkt_file = fopen(pkt_name, R_MODE);
     if(!pkt_file) {
-	log("$ERROR: can't open packet %s", pkt_name);
+	logit("$ERROR: can't open packet %s", pkt_name);
 	TMPS_RETURN(ERROR);
     }
     if(pkt_get_hdr(pkt_file, &pkt) == ERROR)
     {
-	log("ERROR: reading header from %s", pkt_name);
+	logit("ERROR: reading header from %s", pkt_name);
 	TMPS_RETURN(ERROR);
     }
 
@@ -455,7 +455,7 @@
      */
     if(do_routing(pkt_name, pkt_file, &pkt) == ERROR) 
     {
-	log("ERROR: in processing %s", pkt_name);
+	logit("ERROR: in processing %s", pkt_name);
 	TMPS_RETURN(ERROR);
     }
 
@@ -485,7 +485,7 @@
 	name = "";            break;
     }
 
-    log("KILLED%s: exit forced", name);
+    logit("KILLED%s: exit forced", name);
 }
 
 
@@ -661,7 +661,7 @@
 	dir_sortmode(DIR_SORTMTIME);
 	if(dir_open(in_dir, pattern, TRUE) == ERROR)
 	{
-	    log("$ERROR: can't open directory %s", in_dir);
+	    logit("$ERROR: can't open directory %s", in_dir);
 	    exit(EX_OSERR);
 	}
 

Index: ftn2ftn.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/toss/ftn2ftn.c,v
retrieving revision 4.15
retrieving revision 4.16
diff -u -d -r4.15 -r4.16
--- ftn2ftn.c	16 Feb 2003 15:39:02 -0000	4.15
+++ ftn2ftn.c	22 Aug 2004 10:30:03 -0000	4.16
@@ -103,7 +103,7 @@
      */
     if(body->area)
     {
-	log("ftn2ftn: skipping EchoMail");
+	logit("ftn2ftn: skipping EchoMail");
 	return ERROR;
     }
     
@@ -190,12 +190,12 @@
 	type = pkt_get_body(pkt_file, &tl);
 	if(type == ERROR)
 	{
-	    log("ftn2ftn: error reading input packet");
+	    logit("ftn2ftn: error reading input packet");
 	    TMPS_RETURN(ERROR);
 	}
 	
 	if( msg_body_parse(&tl, &body) == -2 )
-	    log("ftn2ftn: error parsing message body");
+	    logit("ftn2ftn: error parsing message body");
 	/* Retrieve address information from body */
 	kludge_pt_intl(&body, &msg, TRUE);
 
@@ -226,12 +226,12 @@
      */
     pkt_file = fopen(pkt_name, R_MODE);
     if(!pkt_file) {
-	log("$Can't open packet %s", pkt_name);
+	logit("$Can't open packet %s", pkt_name);
 	exit(EX_OSERR);
     }
     if(pkt_get_hdr(pkt_file, &pkt) == ERROR)
     {
-	log("Error reading header from %s", pkt_name);
+	logit("Error reading header from %s", pkt_name);
 	exit(EX_OSERR);
     }
     
@@ -240,14 +240,14 @@
      */
     if(unpack(gate, pkt_file, &pkt) != OK) 
     {
-	log("Error in unpacking %s", pkt_name);
+	logit("Error in unpacking %s", pkt_name);
 	exit(EX_OSERR);
     }
     
     fclose(pkt_file);
 
     if (unlink(pkt_name)) {
-	log("$Could not unlink packet %s", pkt_name);
+	logit("$Could not unlink packet %s", pkt_name);
 	exit(EX_OSERR);
     }
 

Index: ftnexpire.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/toss/ftnexpire.c,v
retrieving revision 4.17
retrieving revision 4.18
diff -u -d -r4.17 -r4.18
--- ftnexpire.c	16 Feb 2003 15:39:02 -0000	4.17
+++ ftnexpire.c	22 Aug 2004 10:30:03 -0000	4.18
@@ -117,14 +117,14 @@
     /* Open old history for reading */
     if( (hi_o = fopen(history, R_MODE)) == NULL ) 
     {
-	log("$ERROR: open MSGID history %s failed", history);
+	logit("$ERROR: open MSGID history %s failed", history);
 	return ERROR;
     }
 
     /* Open new history for writing */
     if( (hi_n = fopen(history_n, W_MODE)) == NULL ) 
     {
-	log("$ERROR: open MSGID history %s failed", history_n);
+	logit("$ERROR: open MSGID history %s failed", history_n);
 	fclose(hi_o);
 	return ERROR;
     }
@@ -132,7 +132,7 @@
     /* Create empty new .dir and .pag*/
     if( (fp = fopen(history_n_dir, W_MODE)) == NULL ) 
     {
-	log("$ERROR: open MSGID history %s failed", history_n_dir);
+	logit("$ERROR: open MSGID history %s failed", history_n_dir);
 	fclose(hi_o);
 	fclose(hi_n);
 	return ERROR;
@@ -140,7 +140,7 @@
     fclose(fp);
     if( (fp = fopen(history_n_pag, W_MODE)) == NULL ) 
     {
-	log("$ERROR: open MSGID history %s failed", history_n_pag);
+	logit("$ERROR: open MSGID history %s failed", history_n_pag);
 	fclose(hi_o);
 	fclose(hi_n);
 	return ERROR;
@@ -151,7 +151,7 @@
     dbzincore(1);
     if (dbzagain(history_n, history) < 0)
     {
-	log("$ERROR: dbzagain %s failed", history_n);
+	logit("$ERROR: dbzagain %s failed", history_n);
 	fclose(hi_o);
 	fclose(hi_n);
 	return ERROR;
@@ -175,17 +175,17 @@
     /* Rename */
     if(rename(history_n, history) == ERROR)
     {
-	log("$ERROR: rename %s -> %s failed", history_n, history);
+	logit("$ERROR: rename %s -> %s failed", history_n, history);
 	return ERROR;
     }
     if(rename(history_n_dir, history_dir) == ERROR)
     {
-	log("$ERROR: rename %s -> %s failed", history_n_dir, history_dir);
+	logit("$ERROR: rename %s -> %s failed", history_n_dir, history_dir);
 	return ERROR;
     }
     if(rename(history_n_pag, history_pag) == ERROR)
     {
-	log("$ERROR: rename %s -> %s failed", history_n_pag, history_pag);
+	logit("$ERROR: rename %s -> %s failed", history_n_pag, history_pag);
 	return ERROR;
     }
     
@@ -214,7 +214,7 @@
     p     = strtok(NULL, "\t");
     if(!msgid || !p)
     {
-	log("WARNING: illegal entry in %s, line %ld", history, history_line);
+	logit("WARNING: illegal entry in %s, line %ld", history, history_line);
 	return ERROR;
     }
 
@@ -230,7 +230,7 @@
 	/* Get offset in history text file */
 	if( (offset = ftell(hi_n)) == ERROR)
 	{
-	    log("$ERROR: ftell MSGID history failed");
+	    logit("$ERROR: ftell MSGID history failed");
 	    return ERROR;
 	}
 	
@@ -238,7 +238,7 @@
 	ret = fprintf(hi_n, "%s\t%ld\n", msgid, t);
 	if (ret == ERROR || fflush(hi_n) == ERROR)
 	{
-	    log("$ERROR: write to MSGID history failed");
+	    logit("$ERROR: write to MSGID history failed");
 	    return ERROR;
 	}
 
@@ -248,7 +248,7 @@
 	val.dptr  = (char *)&offset;		/* Value */
 	val.dsize = sizeof offset;
 	if (dbzstore(key, val) < 0) {
-	    log("ERROR: dbzstore of record for MSGID history failed");
+	    logit("ERROR: dbzstore of record for MSGID history failed");
 	    return ERROR;
 	}
     }
@@ -373,7 +373,7 @@
      */
     if(lock_program(DEFAULT_LOCK_HISTORY, w_flag) == ERROR)	/* Already busy */
     {
-	log("MSGID history database is busy");
+	logit("MSGID history database is busy");
 	exit(EXIT_BUSY);
     }
 
@@ -388,7 +388,7 @@
 	expire_delta = 1;
 
     /* Statistics */
-    log("ids processed: %ld total, %ld expired in %ld s, %.2f ids/s",
+    logit("ids processed: %ld total, %ld expired in %ld s, %.2f ids/s",
 	n_processed, n_expired,
 	expire_delta, (double)n_processed/expire_delta);
     

Update of /cvsroot/fidogate/fidogate/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31647/src/util

Modified Files:
	ftnflo.c ftnlog.c 
Log Message:
See ChangeLog

Index: ftnlog.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/util/ftnlog.c,v
retrieving revision 4.10
retrieving revision 4.11
diff -u -d -r4.10 -r4.11
--- ftnlog.c	16 Feb 2003 15:39:04 -0000	4.10
+++ ftnlog.c	22 Aug 2004 10:30:04 -0000	4.11
@@ -127,7 +127,7 @@
 	log_program(p_flag);
     
     for(; optind<argc; optind++)
-	log(argv[optind]);
+	logit(argv[optind]);
     
     exit(EXIT_OK);
 }

Index: ftnflo.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/util/ftnflo.c,v
retrieving revision 4.16
retrieving revision 4.17
diff -u -d -r4.16 -r4.17
--- ftnflo.c	16 Feb 2003 15:39:04 -0000	4.16
+++ ftnflo.c	22 Aug 2004 10:30:04 -0000	4.17
@@ -71,7 +71,7 @@
     /* Open FLO file */
     if(flo_open(node, TRUE) == ERROR)
     {
-/*	log("nothing on hold for %s", znfp1(node)); */
+/*	logit("nothing on hold for %s", znfp1(node)); */
 	return OK;
     }
 
@@ -104,7 +104,7 @@
 		debug(2, "Exit code=%d", ret);
 		if(ret)
 		{
-		    log("ERROR: running command %s", buf);
+		    logit("ERROR: running command %s", buf);
 		    flo_close(node, TRUE, FALSE);
 		    return ERROR;
 		}
@@ -116,7 +116,7 @@
 		    /* ... delete */
 		    debug(2, "Removing %s", line);
 		    if(unlink(line) == ERROR)
-			log("ERROR: can't remove %s", line);
+			logit("ERROR: can't remove %s", line);
 		    break;
 
 		case '#':
@@ -124,10 +124,10 @@
 		    debug(2, "Truncating %s", line);
 #if 0 /* truncate() is not a POSIX function */
 		    if(truncate(line, 0) == ERROR)
-			log("ERROR: can't truncate %s", line);
+			logit("ERROR: can't truncate %s", line);
 #endif
 		    if( (fd = open(line, O_WRONLY|O_TRUNC)) == ERROR )
-			log("ERROR: can't truncate %s", line);
+			logit("ERROR: can't truncate %s", line);
 		    close(fd);
 		    break;
 		}

Update of /cvsroot/fidogate/fidogate/src/tick
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31647/src/tick

Modified Files:
	ftnhatch.c ftntick.c 
Log Message:
See ChangeLog

Index: ftnhatch.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/tick/ftnhatch.c,v
retrieving revision 4.15
retrieving revision 4.16
diff -u -d -r4.15 -r4.16
--- ftnhatch.c	16 Feb 2003 15:39:02 -0000	4.15
+++ ftnhatch.c	22 Aug 2004 10:30:03 -0000	4.16
@@ -79,7 +79,7 @@
     if( (bbs = areasbbs_lookup(area)) == NULL )
     {
 	/* Unknown area: log it, dump it. ;-) */
-	log("ERROR: unknown area %s", area);
+	logit("ERROR: unknown area %s", area);
 	return EXIT_ERROR;
     }
     cf_set_zone(bbs->zone);
@@ -91,7 +91,7 @@
     BUF_COPY3(file_name, bbs->dir, "/", file);
     if(stat(file_name, &st) == ERROR)
     {
-	log("$ERROR: can't stat() file %s", file_name);
+	logit("$ERROR: can't stat() file %s", file_name);
 	return EXIT_ERROR;
     }
     file_size = st.st_size;
@@ -282,7 +282,7 @@
     /* Read FAreas.BBS */
     if(areasbbs_init(areas_bbs) == ERROR)
     {
-	log("$ERROR: can't open %s", areas_bbs);
+	logit("$ERROR: can't open %s", areas_bbs);
 	ret = EX_OSFILE;
     }
     

Index: ftntick.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/tick/ftntick.c,v
retrieving revision 4.27
retrieving revision 4.28
diff -u -d -r4.27 -r4.28
--- ftntick.c	16 Feb 2003 15:39:02 -0000	4.27
+++ ftntick.c	22 Aug 2004 10:30:03 -0000	4.28
@@ -92,7 +92,7 @@
     dir_sortmode(DIR_SORTMTIME);
     if(dir_open(in_dir, pattern, TRUE) == ERROR)
     {
-	log("$ERROR: can't open directory %s", in_dir);
+	logit("$ERROR: can't open directory %s", in_dir);
 	return ERROR;
     }
     
@@ -103,7 +103,7 @@
 	/* Read TIC file */
 	if(tick_get(&tic, name) == ERROR)
 	{
-	    log("$ERROR: reading %s", name);
+	    logit("$ERROR: reading %s", name);
 	    goto rename_to_bad;
 	}
 
@@ -113,7 +113,7 @@
 	
 	tick_debug(&tic, 3);
 
-	log("area %s file %s (%lub) from %s", tic.area, tic.file, tic.size,
+	logit("area %s file %s (%lub) from %s", tic.area, tic.file, tic.size,
 	    znfp1(&tic.from));
 	
 	/*
@@ -131,7 +131,7 @@
 	 */
 	if(!t_flag && !passwd)
 	{
-	    log("%s: no password for %s in PASSWD", name,
+	    logit("%s: no password for %s in PASSWD", name,
 		znfp1(&tic.from)  );
 	    goto rename_to_bad;
 	}
@@ -145,7 +145,7 @@
 	    {
 		if(stricmp(passwd, tic.pw))
 		{
-		    log("%s: wrong password from %s: ours=%s his=%s",
+		    logit("%s: wrong password from %s: ours=%s his=%s",
 			name, znfp1(&tic.from), passwd,
 			tic.pw                                      );
 		    goto rename_to_bad;
@@ -153,7 +153,7 @@
 	    }
 	    else
 	    {
-		log("%s: no password from %s: ours=%s", name,
+		logit("%s: no password from %s: ours=%s", name,
 		    znfp1(&tic.from), passwd );
 		goto rename_to_bad;
 	    }
@@ -161,14 +161,14 @@
 	
 	if(process_tic(&tic) == ERROR)
 	{
-	    log("%s: failed", name);
+	    logit("%s: failed", name);
 	rename_to_bad:
 	    /*
 	     * Error: rename .tic -> .bad
 	     */
 	    str_change_ext(buf, sizeof(buf), name, "bad");
 	    rename(name, buf);
-	    log("%s: renamed to %s", name, buf);
+	    logit("%s: renamed to %s", name, buf);
 	}
 	else 
 	{
@@ -188,7 +188,7 @@
 	    
 	    /* o.k., remove the TIC file */
 	    if(unlink(name) == ERROR)
-		log("$ERROR: can't remove %s", name);
+		logit("$ERROR: can't remove %s", name);
 	}
 
 	tmps_freeall();
@@ -218,7 +218,7 @@
      */
     if(!tic->area)
     {
-	log("ERROR: missing area in %s", tic->file);
+	logit("ERROR: missing area in %s", tic->file);
 	return ERROR;
     }
     if( (bbs = areasbbs_lookup(tic->area)) == NULL )
@@ -227,12 +227,12 @@
 	    (bbs = areasbbs_lookup(unknown_tick_area)) )
 	{
 	    is_unknown = TRUE;
-	    log("unknown area %s, using %s instead",
+	    logit("unknown area %s, using %s instead",
 		  tic->area, unknown_tick_area      );
 	}
 	else
 	{
-	    log("unknown area %s from %s",
+	    logit("unknown area %s from %s",
 		tic->area, znfp1(&tic->from) );
 	    return ERROR;
 	}
@@ -247,7 +247,7 @@
 	 */
 	if(! lon_search(&bbs->nodes, &tic->from) )
 	{
-	    log("insecure tic area %s from %s", tic->area,
+	    logit("insecure tic area %s from %s", tic->area,
 		znfp1(&tic->from)             );
 	    return ERROR;
 	}
@@ -269,14 +269,14 @@
 		    debug(1, "%s -> %s", old_name, new_name);
 		    if(copy_file(old_name, new_name) == ERROR)
 		    {
-			log("$ERROR: can't copy %s -> %s", old_name, new_name);
+			logit("$ERROR: can't copy %s -> %s", old_name, new_name);
 			return ERROR;
 		    }
-		    log("area %s file %s replaces %s, moved to %s",
+		    logit("area %s file %s replaces %s, moved to %s",
 			tic->area, tic->file, tic->replaces, rdir);
 		}
 		else
-		    log("area %s file %s replaces %s, removed",
+		    logit("area %s file %s replaces %s, removed",
 			tic->area, tic->file, tic->replaces);
 		
 		/* Remove old file, no error if this fails */
@@ -330,7 +330,7 @@
 	for(p=new.first; p; p=p->next)
 	{
 	    if(tick_send(tic, &p->node, new_name) == ERROR)
-		log("ERROR: send area %s file %s to %s failed",
+		logit("ERROR: send area %s file %s to %s failed",
 		    tic->area, tic->file, znfp1(&p->node));
 	    tmps_freeall();
 	}
@@ -352,7 +352,7 @@
     /* Copy */
     if(copy_file(old, new) == ERROR)
     {
-	log("$ERROR: can't copy %s -> %s", old, new);
+	logit("$ERROR: can't copy %s -> %s", old, new);
 	return ERROR;
     }
     
@@ -360,7 +360,7 @@
     crc = crc32_file(new);
     if(crc != tic->crc)
     {
-	log("ERROR: error while copying to %s, wrong CRC", new);
+	logit("ERROR: error while copying to %s, wrong CRC", new);
 	unlink(new);
 	return ERROR;
     }
@@ -368,7 +368,7 @@
     /* o.k., now unlink file in inbound */
     if(unlink(old) == ERROR)
     {
-	log("$ERROR: can't remove %s", old);
+	logit("$ERROR: can't remove %s", old);
 	return ERROR;
     }
 
@@ -379,7 +379,7 @@
 	if(utime(new, &ut) == ERROR)
 	{
 #ifndef __CYGWIN32__		/* Some problems with utime() here */
-	    log("$WARNING: can't set time of %s", new);
+	    logit("$WARNING: can't set time of %s", new);
 #endif
 #if 0
 	    return ERROR;
@@ -417,7 +417,7 @@
 	nr = fread(buffer, sizeof(char), sizeof(buffer), fold);
 	if(ferror(fold))
 	{
-	    log("$ERROR: can't read from %s", old);
+	    logit("$ERROR: can't read from %s", old);
 	    fclose(fold);
 	    fclose(fnew);
 	    unlink(new);
@@ -427,7 +427,7 @@
 	nw = fwrite(buffer, sizeof(char), nr, fnew);
 	if(ferror(fnew))
 	{
-	    log("$ERROR: can't write to %s", new);
+	    logit("$ERROR: can't write to %s", new);
 	    fclose(fold);
 	    fclose(fnew);
 	    unlink(new);
@@ -456,7 +456,7 @@
     BUF_COPY3(files_bbs, dir, "/", MY_FILESBBS);
     if( (fp = fopen(files_bbs, A_MODE)) == NULL )
     {
-	log("$ERROR: can't append to %s", files_bbs);
+	logit("$ERROR: can't append to %s", files_bbs);
 	return ERROR;
     }
     
@@ -501,14 +501,14 @@
     
     if(!tic->file)
     {
-	log("ERROR: no file name");
+	logit("ERROR: no file name");
 	return ERROR;
     }
 
     /* Search file */
     if(dir_search(in_dir, tic->file) == NULL)
     {
-	log("ERROR: can't find file %s", tic->file);
+	logit("ERROR: can't find file %s", tic->file);
 	return ERROR;
     }
 
@@ -516,7 +516,7 @@
     BUF_COPY3(name, in_dir, "/", tic->file);
     if(stat(name, &st) == ERROR)
     {
-	log("$ERROR: can't stat() file %s", name);
+	logit("$ERROR: can't stat() file %s", name);
 	return ERROR;
     }
 
@@ -527,7 +527,7 @@
     {
 	if(tic->size != st.st_size)
 	{
-	    log("ERROR: wrong size for file %s: got %lu, expected %lu",
+	    logit("ERROR: wrong size for file %s: got %lu, expected %lu",
 		name, st.st_size, tic->size                           );
 	    return ERROR;
 	}
@@ -551,7 +551,7 @@
     {
 	if(tic->crc != crc)
 	{
-	    log("ERROR: wrong CRC for file %s: got %08lx, expected %08lx",
+	    logit("ERROR: wrong CRC for file %s: got %08lx, expected %08lx",
 		name, crc, tic->crc                                       );
 	    return ERROR;
 	}
@@ -714,7 +714,7 @@
     /* Read FAreas.BBS */
     if(areasbbs_init(areas_bbs) == ERROR)
     {
-	log("$ERROR: can't open %s", areas_bbs);
+	logit("$ERROR: can't open %s", areas_bbs);
 	return EXIT_ERROR;
     }
 

Update of /cvsroot/fidogate/fidogate/src/gate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31647/src/gate

Modified Files:
	ftn2rfc.c ftnin.c ftnmail.c rfc2ftn.c 
Log Message:
See ChangeLog

Index: rfc2ftn.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/gate/rfc2ftn.c,v
retrieving revision 4.72
retrieving revision 4.73
diff -u -d -r4.72 -r4.73
--- rfc2ftn.c	12 Feb 2004 16:37:41 -0000	4.72
+++ rfc2ftn.c	22 Aug 2004 10:30:02 -0000	4.73
@@ -737,7 +737,7 @@
 	 */
 	if(rfc_parse(rfc, name, node, TRUE) == ERROR) {
 #if 0
-	    log("BOUNCE: to=%s, reject=%s", s_rfcaddr_to_asc(rfc, TRUE),
+	    logit("BOUNCE: to=%s, reject=%s", s_rfcaddr_to_asc(rfc, TRUE),
 		(*address_error ? address_error : "unknown")  );
 #endif
 	    return NULL;
@@ -919,7 +919,7 @@
 
 	if(silent_bounces) 
 	{
-	    log("BOUNCE: from=%s, to=%s, reject=%s (SILENT!)",
+	    logit("BOUNCE: from=%s, to=%s, reject=%s (SILENT!)",
 		s_rfcaddr_to_asc(&rfc_from, TRUE),
 		s_rfcaddr_to_asc(&rfc_to, TRUE), msg);
 	    TMPS_RETURN(OK);
@@ -928,7 +928,7 @@
 	{
 	    sendback("Address %s:\n  %s",
 		     s_rfcaddr_to_asc(&rfc_to, TRUE), msg);
-	    log("BOUNCE: from=%s, to=%s, reject=%s",
+	    logit("BOUNCE: from=%s, to=%s, reject=%s",
 		s_rfcaddr_to_asc(&rfc_from, TRUE),
 		s_rfcaddr_to_asc(&rfc_to, TRUE), msg);
 	    TMPS_RETURN(address_exit ? address_exit : EX_NOHOST);
@@ -981,7 +981,7 @@
 	if(limitsize>0 && size>limitsize)
 	{
 	    /* Too large, don't gate it */
-	    log("BOUNCE: from=%s, to=%s, "
+	    logit("BOUNCE: from=%s, to=%s, "
 		"reject=message too big (%ldb, limit %ldb)",
 		s_rfcaddr_to_asc(&rfc_from, TRUE),
 		s_rfcaddr_to_asc(&rfc_to, TRUE), size, limitsize );
@@ -1007,14 +1007,14 @@
 		else
 		{
 		    if(flags)
-			log("NON-LOCAL From: %s, Reply-To: %s, X-Flags: %s",
+			logit("NON-LOCAL From: %s, Reply-To: %s, X-Flags: %s",
 			    hf ? hf : "<>", hr ? hr : "<>", flags           );
 		    flags = p = NULL;
 		}
 	    }
 	    /* Let's at least log what's going on ... */
 	    if(flags)
-		log("X-Flags: %s, From: %s", flags, hf ? hf : "<>");
+		logit("X-Flags: %s, From: %s", flags, hf ? hf : "<>");
 	    
 	    p = flags;
 	    if(p)
@@ -1046,7 +1046,7 @@
 
 	    /* Log what's going on ... */
 	    if(flags)
-		log("FORBIDDEN X-Flags: %s, From: %s", flags, hf ? hf : "<>");
+		logit("FORBIDDEN X-Flags: %s, From: %s", flags, hf ? hf : "<>");
 	    flags = NULL;
 	}
 	
@@ -1148,12 +1148,12 @@
 		{
 		    if(pna_notify(s_rfcaddr_to_asc(&rfc_from, FALSE)))
 		    {
-			log("BOUNCE: Postings from address `%s' to group `%s' not allowed - skipped, sent notify",
+			logit("BOUNCE: Postings from address `%s' to group `%s' not allowed - skipped, sent notify",
 			    s_rfcaddr_to_asc(&rfc_from, FALSE), pa->group);
 			bounce_mail("acl", &rfc_from, &msg, pa->group, &body);
 		    }
 		    else
-			log("BOUNCE: Postings from address `%s' to group `%s' not allowed - skipped",
+			logit("BOUNCE: Postings from address `%s' to group `%s' not allowed - skipped",
 			    s_rfcaddr_to_asc(&rfc_from, FALSE), pa->group);
 		    continue;
 		}
@@ -1163,7 +1163,7 @@
 		if(limitsize>0 && size>limitsize)
 		{
 		    /* Too large, don't gate it */
-		    log("message too big (%ldb, limit %ldb) for area %s",
+		    logit("message too big (%ldb, limit %ldb) for area %s",
 			size, limitsize, pa->area                        );
 		    continue;
 		}
@@ -1188,7 +1188,7 @@
 	/*
 	 * NetMail message
 	 */
-	log("MAIL: from=%s, to=%s",
+	logit("MAIL: from=%s, to=%s",
 	    s_rfcaddr_to_asc(&rfc_from, TRUE),
 	    s_rfcaddr_to_asc(&rfc_to, TRUE));
 	msg.area      = NULL;
@@ -2055,7 +2055,7 @@
 	debug(8, "config: MaxMsgSize %s", p);
 	sz = atol(p);
 	if(sz <= 0)
-	    log("WARNING: illegal MaxMsgSize value %s", p);
+	    logit("WARNING: illegal MaxMsgSize value %s", p);
 	else
 	    areas_maxmsgsize(sz);
     }
@@ -2066,7 +2066,7 @@
 	debug(8, "config: LimitMsgSize %s", p);
 	sz = atol(p);
 	if(sz <= 0)
-	    log("WARNING: illegal LimitMsgSize value %s", p);
+	    logit("WARNING: illegal LimitMsgSize value %s", p);
 	else
 	    areas_limitmsgsize(sz);
     }
@@ -2246,7 +2246,7 @@
 	    debug(3, "re-positioning to offset %ld", pos);
 	    fclose(fppos);
 	    if( fseek(fp, pos, SEEK_SET) == ERROR )
-		log("$WARNING: can't seek to offset %ld in file %s",
+		logit("$WARNING: can't seek to offset %ld in file %s",
 		    pos, f_flag);
 	}
     }
@@ -2293,7 +2293,7 @@
 	{
 	    size = read_rnews_size(fpart);
 	    if(size == -1)
-		log("ERROR: reading news batch");
+		logit("ERROR: reading news batch");
 	    if(size <= 0)
 		break;
 	    debug(3, "Batch: message #%ld size %ld", nmsg, size);

Index: ftnin.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/gate/ftnin.c,v
retrieving revision 4.17
retrieving revision 4.18
diff -u -d -r4.17 -r4.18
--- ftnin.c	16 Feb 2003 15:39:01 -0000	4.17
+++ ftnin.c	22 Aug 2004 10:30:02 -0000	4.18
@@ -139,7 +139,7 @@
 	    debug(5, "node=%s", znfp1(node));
 	    if(bink_bsy_create(node, NOWAIT) == ERROR)
 	    {
-		log("%s busy, skipping", znfp1(node));
+		logit("%s busy, skipping", znfp1(node));
 		continue;
 	    }
 
@@ -191,7 +191,7 @@
 	debug(2, "Exit code=%d", ret);
 	if(ret)
 	{
-	    log("ERROR: can't exec command %s", script);
+	    logit("ERROR: can't exec command %s", script);
 	    return ERROR;
 	}
 	tmps_freeall();
@@ -221,7 +221,7 @@
     debug(2, "Exit code=%d", ret);
     if(ret)
     {
-	log("ERROR: can't exec command %s", buffer);
+	logit("ERROR: can't exec command %s", buffer);
 	return ERROR;
     }
     

Index: ftnmail.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/gate/ftnmail.c,v
retrieving revision 4.7
retrieving revision 4.8
diff -u -d -r4.7 -r4.8
--- ftnmail.c	16 Feb 2003 15:39:01 -0000	4.7
+++ ftnmail.c	22 Aug 2004 10:30:02 -0000	4.8
@@ -204,7 +204,7 @@
 
     /* exec */
     if( execv(cmd, args) == ERROR )
-	log("$can't exec %s", cmd);
+	logit("$can't exec %s", cmd);
 	
     /* Only reached if error */
     exit(1);

Index: ftn2rfc.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/gate/ftn2rfc.c,v
retrieving revision 4.62
retrieving revision 4.63
diff -u -d -r4.62 -r4.63
--- ftn2rfc.c	16 Feb 2003 15:39:00 -0000	4.62
+++ ftn2rfc.c	22 Aug 2004 10:30:02 -0000	4.63
@@ -337,11 +337,11 @@
     {
 	if(feof(pkt_file))
 	{
-	    log("WARNING: premature EOF reading input packet");
+	    logit("WARNING: premature EOF reading input packet");
 	    return OK;
 	}
 	
-	log("ERROR: reading input packet");
+	logit("ERROR: reading input packet");
 	return ERROR;
     }
 
@@ -358,7 +358,7 @@
 	msg.node_to   = pkt->to;
 	if( pkt_get_msg_hdr(pkt_file, &msg) == ERROR )
 	{
-	    log("ERROR: reading input packet");
+	    logit("ERROR: reading input packet");
 	    ret = ERROR;
 	    break;
 	}
@@ -380,11 +380,11 @@
 	{
 	    if(feof(pkt_file))
 	    {
-		log("WARNING: premature EOF reading input packet");
+		logit("WARNING: premature EOF reading input packet");
 	    }
 	    else
 	    {
-		log("ERROR: reading input packet");
+		logit("ERROR: reading input packet");
 		ret = ERROR;
 		tl_clear(&theader);
 		tl_clear(&tbody);
@@ -398,7 +398,7 @@
 	 * Parse message body
 	 */
 	if( msg_body_parse(&tl, &body) == -2 )
-	    log("ERROR: parsing message body");
+	    logit("ERROR: parsing message body");
 	/* Retrieve address information from kludges for NetMail */
 	if(body.area == NULL)
 	{
@@ -471,7 +471,7 @@
 	    /* Skip, if unknown and FTNJunkGroup not set */
 	    if(!area->group && !ftn_junk_group)
 	    {
-		log("unknown area %s", area->area);
+		logit("unknown area %s", area->area);
 		tl_clear(&theader);
 		tl_clear(&tbody);
 		tl_clear(&tl);
@@ -647,7 +647,7 @@
 	    /* ^A SPLIT */
 	    if( (p = kludge_get(&body.kludge, "SPLIT", NULL)) )
 	    {
-		log("skipping split message, origin=%s", znfp1(&msg.node_orig));
+		logit("skipping split message, origin=%s", znfp1(&msg.node_orig));
 		tl_clear(&theader);
 		tl_clear(&tbody);
 		tl_clear(&tl);
@@ -664,7 +664,7 @@
 	{
 	    if(msgbody_rfc_from)
 	    {
-		log("skipping message from gateway, area %s, origin=%s",
+		logit("skipping message from gateway, area %s, origin=%s",
 		    area->area, znfp1(&msg.node_orig));
 		tl_clear(&theader);
 		tl_clear(&tbody);
@@ -677,7 +677,7 @@
 	    if( (p = kludge_get(&body.kludge, "PID", NULL))  &&
 	       !strnicmp(p, "GIGO", 4)                         )
 	    {
-		log("skipping message from gateway (GIGO), area %s, origin=%s",
+		logit("skipping message from gateway (GIGO), area %s, origin=%s",
 		    area->area, znfp1(&msg.node_orig));
 		tl_clear(&theader);
 		tl_clear(&tbody);
@@ -689,7 +689,7 @@
 	    /* Broken FidoZerb message splitting */
 	    if( (p = kludge_get(&body.kludge, "X-FZ-SPLIT", NULL)) )
 	    {
-		log("skipping message from gateway (X-FZ-SPLIT), area %s, origin=%s",
+		logit("skipping message from gateway (X-FZ-SPLIT), area %s, origin=%s",
 		    area->area, znfp1(&msg.node_orig));
 		tl_clear(&theader);
 		tl_clear(&tbody);
@@ -764,7 +764,7 @@
 	if(area==NULL && t_flag && msgbody_rfc_to)
 	{
 	    debug(1, "Insecure message with To line");
-	    log("BOUNCE: insecure mail from %s",
+	    logit("BOUNCE: insecure mail from %s",
 		s_rfcaddr_to_asc(&addr_from, TRUE));
 	    bounce_mail("insecure", &addr_from, &msg, msgbody_rfc_to, &tbody);
 	    tl_clear(&theader);
@@ -810,7 +810,7 @@
 		/* Not registered in HOSTS */
 		debug(1, "Not a registered node: %s",
 		      znfp1(&msg.node_orig));
-		log("BOUNCE: mail from unregistered %s",
+		logit("BOUNCE: mail from unregistered %s",
 		    s_rfcaddr_to_asc(&addr_from, TRUE));
 		bounce_mail("restricted", &addr_from, &msg,
 			    msgbody_rfc_to, &tbody);
@@ -826,7 +826,7 @@
 	    {
 		debug(1, "Registered node is down: %s",
 		      znfp1(&msg.node_orig));
-		log("BOUNCE: mail from down %s",
+		logit("BOUNCE: mail from down %s",
 		    s_rfcaddr_to_asc(&addr_from, TRUE));
 		bounce_mail("down", &addr_from, &msg,
 			    msgbody_rfc_to, &tbody);
@@ -849,7 +849,7 @@
 		if(no_address_in_to_field)
 		{
 		    debug(1, "Message with address in mail_to: %s", mail_to);
-		    log("BOUNCE: mail from %s with address in to field: %s",
+		    logit("BOUNCE: mail from %s with address in to field: %s",
 			s_rfcaddr_to_asc(&addr_from, TRUE), mail_to           );
 		    bounce_mail("addrinto",
 				&addr_from, &msg, msgbody_rfc_to, &tbody);
@@ -879,7 +879,7 @@
 	    {
 		/* Addressed to `UUCP' or `GATEWAY', but no To: line */
 		debug(1, "Message to `UUCP' or `GATEWAY' without To line");
-		log("BOUNCE: mail from %s without To line",
+		logit("BOUNCE: mail from %s without To line",
 		    s_rfcaddr_to_asc(&addr_from, TRUE));
 		bounce_mail("noto", &addr_from, &msg, msgbody_rfc_to, &tbody);
 		tl_clear(&theader);
@@ -958,7 +958,7 @@
 	    {
 		if(!strncmp(p, "<NOMSGID_", 9))
 		{
-		    log("MSGID: %s, not gated", p);
+		    logit("MSGID: %s, not gated", p);
 		    tl_clear(&theader);
 		    tl_clear(&tbody);
 		    tl_clear(&tl);
@@ -969,7 +969,7 @@
 		if(no_unknown_msgid_zones)
 		    if(id_zone>=-1 && !cf_zones_check(id_zone))
 		    {
-			log("MSGID %s: malformed or unknown zone, not gated", p);
+			logit("MSGID %s: malformed or unknown zone, not gated", p);
 			tl_clear(&theader);
 			tl_clear(&tbody);
 			tl_clear(&tl);
@@ -981,7 +981,7 @@
 	    {
 		if(no_messages_without_msgid)
 		{
-		    log("MSGID: none, not gated");
+		    logit("MSGID: none, not gated");
 		    tl_clear(&theader);
 		    tl_clear(&tbody);
 		    tl_clear(&tl);
@@ -994,7 +994,7 @@
 	/* Can't happen, but who knows ... ;-) */
 	if(!id_line)
 	{
-	    log("ERROR: id_line==NULL, strange.");
+	    logit("ERROR: id_line==NULL, strange.");
 	    tl_clear(&theader);
 	    tl_clear(&tbody);
 	    tl_clear(&tl);
@@ -1018,7 +1018,7 @@
 
 	/* Different header for mail and news */
 	if(area==NULL) {			/* Mail */
-	    log("MAIL: %s -> %s", from_line, to_line);
+	    logit("MAIL: %s -> %s", from_line, to_line);
 	    
 	    tl_appendf(&theader,
 		       "From %s %s\n", s_rfcaddr_to_asc(&addr_from, FALSE),
@@ -1258,7 +1258,7 @@
     /* Open packet and read header */
     pkt_file = fopen(pkt_name, R_MODE);
     if(!pkt_file) {
-	log("$ERROR: can't open packet %s", pkt_name);
+	logit("$ERROR: can't open packet %s", pkt_name);
 	if(n_flag)
 	    return ERROR;
 	else
@@ -1269,7 +1269,7 @@
     }
     if(pkt_get_hdr(pkt_file, &pkt) == ERROR)
     {
-	log("ERROR: reading header from %s", pkt_name);
+	logit("ERROR: reading header from %s", pkt_name);
 	if(n_flag)
 	    return ERROR;
 	else
@@ -1280,12 +1280,12 @@
     }
     
     /* * Unpack it */
-    log("packet %s (%ldb) from %s to %s", pkt_name, check_size(pkt_name),
+    logit("packet %s (%ldb) from %s to %s", pkt_name, check_size(pkt_name),
 	znfp1(&pkt.from), znfp2(&pkt.to) );
     
     if(unpack(pkt_file, &pkt) == ERROR) 
     {
-	log("ERROR: processing %s", pkt_name);
+	logit("ERROR: processing %s", pkt_name);
 	if(n_flag)
 	    return ERROR;
 	else
@@ -1298,7 +1298,7 @@
     fclose(pkt_file);
     
     if(!n_flag && unlink(pkt_name)==ERROR) {
-	log("$ERROR: can't unlink packet %s", pkt_name);
+	logit("$ERROR: can't unlink packet %s", pkt_name);
 	rename_bad(pkt_name);
 	return OK;
     }
@@ -1629,7 +1629,7 @@
 	dir_sortmode(DIR_SORTMTIME);
 	if(dir_open(in_dir, "*.pkt", TRUE) == ERROR)
 	{
-	    log("$ERROR: can't open directory %s", in_dir);
+	    logit("$ERROR: can't open directory %s", in_dir);
 	    if(l_flag)
 		unlock_program(PROGRAM);
 	    exit(EX_OSERR);

Update of /cvsroot/fidogate/fidogate/src/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31647/src/include

Modified Files:
	prototypes.h 
Log Message:
See ChangeLog

Index: prototypes.h
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/include/prototypes.h,v
retrieving revision 4.69
retrieving revision 4.70
diff -u -d -r4.69 -r4.70
--- prototypes.h	16 Feb 2003 15:39:01 -0000	4.69
+++ prototypes.h	22 Aug 2004 10:30:02 -0000	4.70
@@ -270,7 +270,7 @@
 extern int no_debug;
 
 char   *strerror		(int);
-void	log			(const char *, ...)
+void	logit			(const char *, ...)
     __attribute__ ((format (printf, 1, 2)));
 void	debug			(int, const char *, ...)
     __attribute__ ((format (printf, 2, 3)));

Update of /cvsroot/fidogate/fidogate/src/ffx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31647/src/ffx

Modified Files:
	ffx.c ffxqt.c 
Log Message:
See ChangeLog

Index: ffx.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/ffx/ffx.c,v
retrieving revision 4.17
retrieving revision 4.18
diff -u -d -r4.17 -r4.18
--- ffx.c	16 Feb 2003 15:39:00 -0000	4.17
+++ ffx.c	22 Aug 2004 10:30:01 -0000	4.18
@@ -125,7 +125,7 @@
     out = cf_zones_out(node->zone);
     if(!out)
     {
-	log("ffx: no configured outbound for zone %d",
+	logit("ffx: no configured outbound for zone %d",
 		node->zone);
 	return EX_DATAERR;
     }
@@ -137,7 +137,7 @@
 	if( mkdir(ctrlname, DIR_MODE) == -1 )
 	    if(errno != EEXIST)
 	    {
-		log("$ffx: can't create directory %s", ctrlname);
+		logit("$ffx: can't create directory %s", ctrlname);
 		return EX_OSERR;
 	    }
 	
@@ -159,7 +159,7 @@
     debug(2, "ffx: ctrl=%s", ctrlname);
     debug(2, "ffx: data=%s", dataname);
     
-    log("job %s: to %s / %s", seq, znfp1(node), buffer);
+    logit("job %s: to %s / %s", seq, znfp1(node), buffer);
 
     /* Get password for node */
     pwd = passwd_lookup("ffx", node);
@@ -176,7 +176,7 @@
     ctrl = fopen(ctrlname, W_MODE);
     if(!ctrl)
     {
-	log("$ffx: can't create %s", ctrlname);
+	logit("$ffx: can't create %s", ctrlname);
 	return EX_OSERR;
     }
     
@@ -208,14 +208,14 @@
 	    nr = fread(buffer, sizeof(char), sizeof(buffer), stdin);
 	    if(ferror(stdin))
 	    {
-		log("$ERROR: can't read from stdin");
+		logit("$ERROR: can't read from stdin");
 		ret = ERROR;
 	    }
 	    
 	    nw = fwrite(buffer, sizeof(char), nr, data);
 	    if(ferror(data))
 	    {
-		log("$ERROR: can't write to %s", dataname);
+		logit("$ERROR: can't write to %s", dataname);
 		ret = ERROR;
 	    }
 	}
@@ -225,13 +225,13 @@
     }
     else
     {
-	log("$ffx: can't open %s", dataname);
+	logit("$ffx: can't open %s", dataname);
 	ret = ERROR;
     }
     
     if(ret)
     {
-	log("ffx: failed to spool job %s", seq);
+	logit("ffx: failed to spool job %s", seq);
 	unlink(ctrlname);
 	unlink(dataname);
 	return EX_OSERR;
@@ -248,14 +248,14 @@
 	 */
 	if(bink_attach(node, '^', dataname, flav, batch==NULL) == ERROR)
 	{
-	    log("ffx: failed to spool job %s", seq);
+	    logit("ffx: failed to spool job %s", seq);
 	    unlink(ctrlname);
 	    unlink(dataname);
 	    return EX_OSERR;
 	}
 	if(bink_attach(node, '^', ctrlname, flav, batch==NULL) == ERROR)
 	{
-	    log("ffx: failed to spool job %s", seq);
+	    logit("ffx: failed to spool job %s", seq);
 	    unlink(ctrlname);
 	    unlink(dataname);
 	    return EX_OSERR;
@@ -437,12 +437,12 @@
      */
     if(optind >= argc)
     {
-	log("expecting FTN address");
+	logit("expecting FTN address");
 	short_usage();
     }
     if(asc_to_node(argv[optind], &node, FALSE) == ERROR)
     {
-	log("invalid FTN address %s", argv[optind]);
+	logit("invalid FTN address %s", argv[optind]);
 	short_usage();
     }
     optind++;
@@ -452,7 +452,7 @@
      */
     if(optind >= argc)
     {
-	log("expecting command");
+	logit("expecting command");
 	short_usage();
     }
     cmdc = argc - optind;

Index: ffxqt.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/ffx/ffxqt.c,v
retrieving revision 4.25
retrieving revision 4.26
diff -u -d -r4.25 -r4.26
--- ffxqt.c	16 Feb 2003 15:39:00 -0000	4.25
+++ ffxqt.c	22 Aug 2004 10:30:01 -0000	4.26
@@ -177,14 +177,14 @@
     BUF_EXPAND(buffer, cf_p_pinbound());
     if( chdir(buffer) == -1 )
     {
-	log("$ERROR: can't chdir %s", buffer);
+	logit("$ERROR: can't chdir %s", buffer);
 	return ERROR;
     }
 
     dir_sortmode(DIR_SORTMTIME);
     if(dir_open(".", pattern, TRUE) == ERROR)
     {
-	log("$ERROR: can't open directory .");
+	logit("$ERROR: can't open directory .");
 	return ERROR;
     }
     
@@ -219,7 +219,7 @@
 	 */
 	if(!t_flag && !passwd)
 	{
-	    log("ERROR: %s: no password for %s in PASSWD",
+	    logit("ERROR: %s: no password for %s in PASSWD",
 		name, znfp1(&ffx->from)  );
 	    goto rename_to_bad;
 	}
@@ -233,7 +233,7 @@
 	    {
 		if(stricmp(passwd, ffx->passwd))
 		{
-		    log("ERROR: %s: wrong password from %s: ours=%s his=%s",
+		    logit("ERROR: %s: wrong password from %s: ours=%s his=%s",
 			name, znfp1(&ffx->from), passwd,
 			ffx->passwd                              );
 		    goto rename_to_bad;
@@ -241,26 +241,26 @@
 	    }
 	    else
 	    {
-		log("ERROR: %s: no password from %s: ours=%s", name,
+		logit("ERROR: %s: no password from %s: ours=%s", name,
 		    znfp1(&ffx->from), passwd );
 		goto rename_to_bad;
 	    }
 	}
 
-	log("job %s: from %s data %s (%ldb) / %s",
+	logit("job %s: from %s data %s (%ldb) / %s",
 	    ffx->job, znfp1(&ffx->from), ffx->file, check_size(ffx->file),
 	    ffx->cmd);
 	
 	if(exec_ffx(ffx) == ERROR)
 	{
-	    log("%s: command failed", name);
+	    logit("%s: command failed", name);
 	rename_to_bad:
 	    /*
 	     * Error: rename .ffx -> .bad
 	     */
 	    str_change_ext(buf, sizeof(buf), name, "bad");
 	    rename(name, buf);
-	    log("%s: renamed to %s", name, buf);
+	    logit("%s: renamed to %s", name, buf);
 	}
 	
 	tmps_freeall();
@@ -336,7 +336,7 @@
     fp = fopen(ffx.name, R_MODE);
     if(!fp)
     {
-	log("$ERROR: can't open %s", ffx.name);
+	logit("$ERROR: can't open %s", ffx.name);
 	return NULL;
     }
     
@@ -450,12 +450,12 @@
     cmd_c = find_ffxcmd('C', name);
     if(!cmd_c)
     {
-	log("ERROR: no FFXCommand found for \"%s\"", name);
+	logit("ERROR: no FFXCommand found for \"%s\"", name);
 	return ERROR;
     }
     if(ffx->decompr) 
     {
-	log("ERROR: uncompressing no longer supported in this version");
+	logit("ERROR: uncompressing no longer supported in this version");
 	return ERROR;
     }
 
@@ -503,7 +503,7 @@
     {
 	if(n >= MAXARGS-1) 
 	{
-	    log("ERROR: too many args in run_ffx_cmd()");
+	    logit("ERROR: too many args in run_ffx_cmd()");
 	    return ERROR;
 	}
 	args[n++] = p;
@@ -525,7 +525,7 @@
     pid = fork();
     if(pid == ERROR) 
     {
-	log("$ERROR: fork failed");
+	logit("$ERROR: fork failed");
 	return ERROR;
     }
 
@@ -534,15 +534,15 @@
 	/* parent */
 	if(waitpid(pid, &status, 0) == ERROR) 
 	{
-	    log("$ERROR: waitpid failed");
+	    logit("$ERROR: waitpid failed");
 	    return ERROR;
 	}
 	if(WIFEXITED(status))
 	    return WEXITSTATUS(status);
 	if(WIFSIGNALED(status)) 
-	    log("ERROR: child %s caught signal %d", cmd, WTERMSIG(status));
+	    logit("ERROR: child %s caught signal %d", cmd, WTERMSIG(status));
 	else
-	    log("ERROR: child %s, exit status=%04x", cmd, status);
+	    logit("ERROR: child %s, exit status=%04x", cmd, status);
 	return ERROR;
     }
     else 
@@ -550,11 +550,11 @@
 	/* child */
 	if(! freopen(data, R_MODE, stdin)) 
 	{
-	    log("ERROR: can't freopen stdin to %s", data);
+	    logit("ERROR: can't freopen stdin to %s", data);
 	    exit(1);
 	}
 	if( execv(cmd, args) == ERROR )
-	    log("ERROR: execv %s failed", cmd);
+	    logit("ERROR: execv %s failed", cmd);
 	exit(1);
     }
 

Update of /cvsroot/fidogate/fidogate/src/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7397/src/common

Modified Files:
	log.c 
Log Message:
See ChangeLog

Index: log.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/common/log.c,v
retrieving revision 4.22
retrieving revision 4.23
diff -u -d -r4.22 -r4.23
--- log.c	20 Aug 2004 21:21:39 -0000	4.22
+++ log.c	22 Aug 2004 08:59:00 -0000	4.23
@@ -279,11 +279,4 @@
     char *p;
     
     BUF_COPY(logprog, name);
-
-#if 0 /**NOT NEEDED AND SECURITY RISK**/
-    if( (p = getenv("LOGFILE")) )
-	log_file(p);
-    if( (p = getenv("FIDOGATE_LOGFILE")) )
-	log_file(p);
-#endif
 }

Update of /cvsroot/fidogate/fidogate/src/gate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7397/src/gate

Modified Files:
	send-fidogate.sh 
Log Message:
See ChangeLog

Index: send-fidogate.sh
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/gate/send-fidogate.sh,v
retrieving revision 4.4
retrieving revision 4.5
diff -u -d -r4.4 -r4.5
--- send-fidogate.sh	9 Jun 2003 12:10:57 -0000	4.4
+++ send-fidogate.sh	22 Aug 2004 08:59:01 -0000	4.5
@@ -5,6 +5,9 @@
 # SH script to send batches to FIDOGATE
 #
 
+# Uncomment to use optimized rfc2ftn -f version
+#OPTIMIZE=yes
+
 # Output to "log-news" log file
 FIDOGATE_LOGFILE="%G/log-news"
 export FIDOGATE_LOGFILE
@@ -62,11 +65,24 @@
 
     echo "${PROGNAME}: [$$] begin ${SITE}"
 
-    case "$VERSION" in
+    INNVERSION="unknown"
+    if [ "$OPTIMIZE" = "yes" ]; then
+	INNVERSION="$VERSION"
+    fi
+
+    case "$INNVERSION" in
     "INN 2.2"*)
-	# optimized version for INN 2.2, no longer works with INN 2.3
+	# optimized version for INN 2.2, no longer works with INN 2.3+
 	time $RFC2FTN -f $BATCHFILE -m 500
 	;;
+    "INN 2.4*")
+	# optimized version for INN 2.4 using sm <vik>
+	while read a b; do
+	    echo `$NEWSBIN/sm -i $a` $b | sed -e 's/\:\ /\//' >> $BATCHFILE.fullpath
+	done < $BATCHFILE 2> /dev/null
+	rm -f $BATCHFILE
+	time $RFC2FTN -f $BATCHFILE.fullpath -m 500
+	;;
     *)
 	# generic version using batcher
 	time batcher -b500000 -p"$RFC2FTN -b -n" ${SITE} ${BATCHFILE}

Update of /cvsroot/fidogate/fidogate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7397

Modified Files:
	ChangeLog 
Log Message:
See ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fidogate/fidogate/ChangeLog,v
retrieving revision 4.318
retrieving revision 4.319
diff -u -d -r4.318 -r4.319
--- ChangeLog	20 Aug 2004 21:21:38 -0000	4.318
+++ ChangeLog	22 Aug 2004 08:58:59 -0000	4.319
@@ -1,3 +1,16 @@
+2004-08-22  Martin Junius  <mj.at.n0ll.dot.net>
+
+	------- CVS ci -------------------------------------------------------
+
+	* src/common/log.c (log_program): removed insecure code entirely,
+	  thanks to Niels Heinen for pointing this out.
+
+	* src/gate/send-fidogate.sh: added optimized version using rfc2ftn
+	  -f for INN 2.4, thanks to Viktor Kafke.
+	  Optimized versions for INN 2.2 und INN 2.4 enabled by
+	  OPTIMIZED=yes at the start of this script, default = commented =
+	  off.
+
 2004-08-20  Martin Junius  <mj.at.n0ll.dot.net>
 
 	------- CVS ci -------------------------------------------------------

Update of /cvsroot/fidogate/fidogate/src/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32722/src/common

Modified Files:
	log.c 
Log Message:
See ChangeLog

Index: log.c
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/common/log.c,v
retrieving revision 4.21
retrieving revision 4.22
diff -u -d -r4.21 -r4.22
--- log.c	16 Feb 2003 15:38:56 -0000	4.21
+++ log.c	20 Aug 2004 21:21:39 -0000	4.22
@@ -280,8 +280,10 @@
     
     BUF_COPY(logprog, name);
 
+#if 0 /**NOT NEEDED AND SECURITY RISK**/
     if( (p = getenv("LOGFILE")) )
-       log_file(p);
+	log_file(p);
     if( (p = getenv("FIDOGATE_LOGFILE")) )
-       log_file(p);
+	log_file(p);
+#endif
 }

Update of /cvsroot/fidogate/fidogate/scripts/maintenance
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32722/scripts/maintenance

Modified Files:
	Makefile 
Log Message:
See ChangeLog

Index: Makefile
===================================================================
RCS file: /cvsroot/fidogate/fidogate/scripts/maintenance/Makefile,v
retrieving revision 4.12
retrieving revision 4.13
diff -u -d -r4.12 -r4.13
--- Makefile	8 Mar 2004 21:44:37 -0000	4.12
+++ Makefile	20 Aug 2004 21:21:38 -0000	4.13
@@ -28,6 +28,7 @@
 
 install:
 	$(INSTALL_PROG) logsendmail $(PREFIX)$(BINDIR)
+	$(INSTALL_PROG) logsendmail2 $(PREFIX)$(BINDIR)
 	$(INSTALL_PROG) logreport $(PREFIX)$(BINDIR)
 	$(INSTALL_PROG) logstat $(PREFIX)$(BINDIR)
 	$(INSTALL_PROG) logdaily $(PREFIX)$(BINDIR)

Update of /cvsroot/fidogate/fidogate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32722

Modified Files:
	ChangeLog 
Log Message:
See ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fidogate/fidogate/ChangeLog,v
retrieving revision 4.317
retrieving revision 4.318
diff -u -d -r4.317 -r4.318
--- ChangeLog	14 Mar 2004 20:31:58 -0000	4.317
+++ ChangeLog	20 Aug 2004 21:21:38 -0000	4.318
@@ -1,5 +1,14 @@
+2004-08-20  Martin Junius  <mj.at.n0ll.dot.net>
+
+	------- CVS ci -------------------------------------------------------
+
+	* src/common/log.c (log_program): commented getenv()s, create
+	  security risk for setuid news programs.
+
 2004-03-14  Martin Junius  <mj...@m-...>
 
+	* scripts/maintenance/Makefile (install): added logsendmail2.
+
 	------- CVS ci -------------------------------------------------------
 
 	* scripts/maintenance/logsendmail2.pl: added stats for sendmail

Update of /cvsroot/fidogate/fidogate/scripts/maintenance
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11903/scripts/maintenance

Modified Files:
	logsendmail2.pl 
Log Message:
See ChangeLog

Index: logsendmail2.pl
===================================================================
RCS file: /cvsroot/fidogate/fidogate/scripts/maintenance/logsendmail2.pl,v
retrieving revision 4.1
retrieving revision 4.2
diff -u -d -r4.1 -r4.2
--- logsendmail2.pl	8 Mar 2004 21:44:37 -0000	4.1
+++ logsendmail2.pl	14 Mar 2004 20:31:58 -0000	4.2
@@ -94,6 +94,8 @@
 my %domain_total;
 my %domain_count;
 
+my %bounce_msg;
+
 
 
 # collect from=, size= / to= data
@@ -129,6 +131,15 @@
 	    next;
 	}
 
+	if($rest =~ /<.+?@.+?>\.\.\. (.*)$/) {
+	    $v = $1;
+#	    print "bounce=$v\n";
+	    $v =~ s/address .+?@.+? does not exist/address ... does not exist/;
+	    $v =~ s/\[?\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\]?/.../;
+	    $bounce_msg{$v}++;
+	}
+
+
 	undef %entry;
 	for $v (split(', ', $rest)) {
 	    if( $v =~ /^(\w+)=(.*)$/ ) {
@@ -261,8 +272,17 @@
 printf "%-32s %5d %9d\n",
   "", $sum_count, $sum_total;
 
+print
+  "\n",
+  "Bounce messages\n",
+  "--------------------------------------------------------------------\n";
 
+for $v (sort keys %bounce_msg) {
+    printf "%-62.62s %5d\n", $v, $bounce_msg{$v};
+}
 
+print
+  "--------------------------------------------------------------------\n";
 
 
 close(OUT) if($out_flag);

Update of /cvsroot/fidogate/fidogate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11903

Modified Files:
	ChangeLog 
Log Message:
See ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fidogate/fidogate/ChangeLog,v
retrieving revision 4.316
retrieving revision 4.317
diff -u -d -r4.316 -r4.317
--- ChangeLog	8 Mar 2004 21:44:36 -0000	4.316
+++ ChangeLog	14 Mar 2004 20:31:58 -0000	4.317
@@ -1,3 +1,10 @@
+2004-03-14  Martin Junius  <mj...@m-...>
+
+	------- CVS ci -------------------------------------------------------
+
+	* scripts/maintenance/logsendmail2.pl: added stats for sendmail
+	  bounce messages.
+
 2004-03-08  Martin Junius  <mj...@m-...>
 
 	------- CVS ci -------------------------------------------------------

Update of /cvsroot/fidogate/fidogate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29406

Modified Files:
	ChangeLog 
Log Message:
See ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fidogate/fidogate/ChangeLog,v
retrieving revision 4.315
retrieving revision 4.316
diff -u -d -r4.315 -r4.316
--- ChangeLog	11 Feb 2004 21:25:33 -0000	4.315
+++ ChangeLog	8 Mar 2004 21:44:36 -0000	4.316
@@ -1,3 +1,16 @@
+2004-03-08  Martin Junius  <mj...@m-...>
+
+	------- CVS ci -------------------------------------------------------
+
+	* scripts/maintenance/Makefile (PROGS): added logsendmail2.
+
+	* scripts/maintenance/logsendmail2.pl: new version of logsendmail
+	  utility. 
+
+2004-02-12  Martin Junius  <mj...@m-...>
+
+	* src/gate/rfc2ftn.c (receiver): "sysop" is always a valid name.
+
 2004-02-11  Martin Junius  <mj...@m-...>
 
 	------- CVS ci -------------------------------------------------------

Update of /cvsroot/fidogate/fidogate/scripts/maintenance
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29406/scripts/maintenance

Modified Files:
	Makefile 
Added Files:
	logsendmail2.pl 
Log Message:
See ChangeLog

--- NEW FILE: logsendmail2.pl ---
#!/usr/bin/perl
#
# $Id: logsendmail2.pl,v 4.1 2004/03/08 21:44:37 n0ll Exp $
#
# Gather statistics from sendmail V8 syslog output
#

use strict;

my $VERSION    = '$Revision: 4.1 $ ';
my $PROGRAM    = "logsendmail2";

our($opt_v, $opt_c, $opt_o, $opt_g, $opt_s, $opt_n, $opt_m);
use Getopt::Std;

# Common configuration for perl scripts 
#<INCLUDE config.pl>


my $NEWSGROUPS = "fido.de.lists";
my $SUBJECT    = "morannon.fido.de sendmail accounting report";

my $INEWS      = "/usr/bin/inews -h -S";
my $SENDMAIL   = "/usr/sbin/sendmail";


getopts('vc:o:g:s:nm:');

my $out_flag;
my $output;

if($opt_g) {
    $NEWSGROUPS = $opt_g;
}
if($opt_s) {
    $SUBJECT    = $opt_s;
}
if($opt_n) {
    open(OUT, "|$INEWS") || die "$PROGRAM: can't open pipe to inews\n";
    select(OUT);
    $out_flag = 1;
}
if($opt_m) {
    open(OUT, "|$SENDMAIL $opt_m")
	|| die "$PROGRAM: can't open pipe to sendmail\n";
    select(OUT);
    $out_flag = 1;
}
if($opt_o) {
    $output = $opt_o;
    open(OUT, ">$output") || die "$PROGRAM: can't open $output\n";
    select(OUT);
    $out_flag = 1;
}



print "Newsgroups: $NEWSGROUPS\n" if($opt_n);
print "Subject: $SUBJECT\n" if($opt_m || $opt_n);
print "\n" if($opt_m || $opt_n);


sub parse_addr {
    my($addr) = @_;

    # only work with <us...@do...> addresses
    if($addr =~ /^<(.+)@(.+)>$/ ) {
	return $2;
    }

    return;
}



my $first_date;
my $output_date;
my $last_date;
my $date;
my $id;
my $rest;
my $v;
my %entry;
my $to;
my $size;
my $from;
my $mailer;
my $local;

my %id_from;
my %id_to;
my %id_size;

my %domain_total;
my %domain_count;



# collect from=, size= / to= data
while(<>) {
    chomp;

    if( /^(.+) [a-zA-Z0-9_\-]+ sendmail\[\d+\]: ([A-Za-z0-9]+): (.*)$/ ) {
	$date = $1;
	$id   = $2;
	$rest = $3;

	if(!$first_date) {
	    $first_date = $1;
	    $output_date = substr($first_date, 0, 6);
	    $output_date =~ s/ /-/g;
	}
	$last_date  = $1;

	# clone
	##FIXME: is this still needed???
	if($rest =~ /^clone (\w+),/) {
	    print "# $id: $rest\n" if($opt_v);
	    $id_size{$id} = $id_size{$1};
	    $id_from{$id} = $id_from{$1};
	}

	# bounce message
	if($rest =~ /^([A-Za-z0-9]+): (.*?): (.*)$/) {
##NOT USED
#	    $dsn{$1} = "$id:$2:$3";
#	    $dsn_count{$2}++;
#	    print "DSN: $1, $id, $2, $3\n" if($opt_v);
	    next;
	}

	undef %entry;
	for $v (split(', ', $rest)) {
	    if( $v =~ /^(\w+)=(.*)$/ ) {
		$entry{$1} = $2;
	    }
        }


	# from= entry
	if($rest =~ /^from=/) {
	    if($entry{"from"}) {
		$from = lc parse_addr($entry{"from"});
		$from = "LOCAL" unless($from);
		$size = $entry{"size"};
		$id_size{$id} = $size;
		$id_from{$id} = $from;
	    }
	}

	# to= entry
	if($rest =~ /^to=/) {
	    next if($entry{"stat"} =~ /^Queued/);
	    next if($entry{"stat"} =~ /^Deferred/);

	    if($entry{"to"}) {
		if($entry{"stat"} =~ /^Host unknown/) {
#		    $stat_host_unknown++;
#		    $stat_ftn_unknown++ if($entry{"mailer"} =~ /^ftn/);
		    next;
		}
		if($entry{"stat"} =~ /^User unknown/) {
#		    $stat_user_unknown++;
		    next;
		}
		if($entry{"stat"} =~ /^Service unavailable/) {
#		    $stat_service_unavail++;
		    next;
		}
		if(! $entry{"stat"} =~ /^Sent/) {
		    print "unknown stat=$entry{\"stat\"} for mail $id to=$entry{\"to\"}\n" if($opt_v);
		    next;
		}
		
		$to     = lc parse_addr($entry{"to"});
		next unless($to);
		$mailer = lc $entry{"mailer"};
		$local  = $mailer eq "local" || $mailer eq "ftn"
		  || $mailer eq "ftni";
		$size   = $id_size{$id};
		$from   = $id_from{$id};

		if(!$from) {
		    print "no from= for mail $id to=$entry{\"to\"}\n" if($opt_v);
		    next;
		}

		if($local) {
		    $domain_total{$to} += $size;
		    $domain_count{$to} ++;
		}

	    }
	}	    


	# ruleset entry
	if($v = $entry{"ruleset"}) {
#	    print "ruleset $v, from=$entry{\"arg1\"}\n" if($opt_v);
##NOT USED
#	    $ruleset_reject{$v}++;
#	    $ruleset_count++;
	    next;
	}


    }
}



# output

my $txt = "Sendmail statistics: $first_date -- $last_date";
my $len = length($txt);

print
  $txt, "\n",
  "=" x $len, "\n\n";

sub domainsort {
    my ($da, $db) = ($a, $b);
    if($a =~ /\.([a-z0-9\-]+\.[a-z]+)$/) {
	$da = $1;
    }
    if($b =~ /\.([a-z0-9\-]+\.[a-z]+)$/) {
	$db = $1;
    }
    return $da cmp $db if($da ne $db);
    return -1          if($da eq $a && $db ne $b);
    return 1           if($db eq $b && $da ne $a);
    return $a  cmp $b;
}

sub printdomain {
    my ($a) = @_;

    if($a =~ /^([a-z0-9\-.]+?)(\.[a-z0-9\-]+\.[a-z]+)$/) {
	return sprintf "%-15s%-16s ", $1, $2;
    }
    return sprintf "%-16s%-16s", "", $a;
}


print
  "-> Domain                            #     bytes\n",
  "------------------------------------------------\n";

my $sum_total = 0;
my $sum_count = 0;

for $v (sort domainsort keys %domain_total) {
    printf "%s %5d %9d\n",
      printdomain($v), $domain_count{$v}, $domain_total{$v};
    $sum_total += $domain_total{$v};
    $sum_count += $domain_count{$v};
}

print
  "------------------------------------------------\n";
printf "%-32s %5d %9d\n",
  "", $sum_count, $sum_total;





close(OUT) if($out_flag);

Index: Makefile
===================================================================
RCS file: /cvsroot/fidogate/fidogate/scripts/maintenance/Makefile,v
retrieving revision 4.11
retrieving revision 4.12
diff -u -d -r4.11 -r4.12
--- Makefile	17 Oct 1999 11:49:29 -0000	4.11
+++ Makefile	8 Mar 2004 21:44:37 -0000	4.12
@@ -16,7 +16,8 @@
 include $(TOPDIR)/rules.make
 
 
-PROGS		= logcheck logreport logstat logdaily logsendmail\
+PROGS		= logcheck logreport logstat logdaily \
+		  logsendmail logsendmail2\
 		  rc.fidogate runchklock
 
 

Update of /cvsroot/fidogate/fidogate
In directory sc8-pr-cvs1:/tmp/cvs-serv12341

Modified Files:
	ChangeLog 
Log Message:
See ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fidogate/fidogate/ChangeLog,v
retrieving revision 4.313
retrieving revision 4.314
diff -u -d -r4.313 -r4.314
--- ChangeLog	18 Jun 2003 18:54:00 -0000	4.313
+++ ChangeLog	13 Dec 2003 21:20:10 -0000	4.314
@@ -1,3 +1,15 @@
+2003-12-13  Martin Junius  <mj...@m-...>
+
+	------- CVS ci -------------------------------------------------------
+
+	* sendmail/cf/redhat9-morannon.mc: dito.
+
+	* sendmail/cf/redhat9-orodruin.mc: enabled TRUST_AUTH_MECH.
+
+2003-10-28  Martin Junius  <mj...@m-...>
+
+	* sendmail/cf/redhat9-orodruin.mc: use masquerade and genericstable.
+
 2003-06-18  Martin Junius  <mj...@m-...>
 
 	------- CVS ci -------------------------------------------------------

Update of /cvsroot/fidogate/fidogate/sendmail/cf
In directory sc8-pr-cvs1:/tmp/cvs-serv12341/sendmail/cf

Modified Files:
	redhat9-morannon.mc redhat9-orodruin.mc 
Log Message:
See ChangeLog

Index: redhat9-morannon.mc
===================================================================
RCS file: /cvsroot/fidogate/fidogate/sendmail/cf/redhat9-morannon.mc,v
retrieving revision 4.1
retrieving revision 4.2
diff -u -d -r4.1 -r4.2
--- redhat9-morannon.mc	18 Jun 2003 14:18:25 -0000	4.1
+++ redhat9-morannon.mc	13 Dec 2003 21:20:10 -0000	4.2
@@ -42,8 +42,8 @@
 dnl # use LOGIN. Other mechanisms should be used if the connection is not
 dnl # guaranteed secure.
 dnl #
-dnl TRUST_AUTH_MECH(`EXTERNAL DIGEST-MD5 CRAM-MD5 LOGIN PLAIN')dnl
-dnl define(`confAUTH_MECHANISMS', `EXTERNAL GSSAPI DIGEST-MD5 CRAM-MD5 LOGIN PLAIN')dnl
+TRUST_AUTH_MECH(`EXTERNAL DIGEST-MD5 CRAM-MD5 LOGIN PLAIN')dnl
+define(`confAUTH_MECHANISMS', `EXTERNAL GSSAPI DIGEST-MD5 CRAM-MD5 LOGIN PLAIN')dnl
 dnl #
 dnl # Rudimentary information on creating certificates for sendmail TLS:
 dnl #     make -C /usr/share/ssl/certs usage

Index: redhat9-orodruin.mc
===================================================================
RCS file: /cvsroot/fidogate/fidogate/sendmail/cf/redhat9-orodruin.mc,v
retrieving revision 4.1
retrieving revision 4.2
diff -u -d -r4.1 -r4.2
--- redhat9-orodruin.mc	26 Apr 2003 16:35:06 -0000	4.1
+++ redhat9-orodruin.mc	13 Dec 2003 21:20:10 -0000	4.2
@@ -16,7 +16,7 @@
 dnl #
 define(`SMART_HOST', ffx:morannon.fido.de)
 dnl #
-define(`confCF_VERSION', `redhat9-orodruin-1.2')
+define(`confCF_VERSION', `redhat9-orodruin-1.3')
 define(`confMIME_FORMAT_ERRORS', `False')
 define(`confDEF_USER_ID',``8:12'')dnl
 define(`confTRUSTED_USER', `smmsp')dnl
@@ -43,8 +43,8 @@
 dnl # use LOGIN. Other mechanisms should be used if the connection is not
 dnl # guaranteed secure.
 dnl #
-dnl TRUST_AUTH_MECH(`EXTERNAL DIGEST-MD5 CRAM-MD5 LOGIN PLAIN')dnl
-dnl define(`confAUTH_MECHANISMS', `EXTERNAL GSSAPI DIGEST-MD5 CRAM-MD5 LOGIN PLAIN')dnl
+TRUST_AUTH_MECH(`EXTERNAL DIGEST-MD5 CRAM-MD5 LOGIN PLAIN')dnl
+define(`confAUTH_MECHANISMS', `EXTERNAL GSSAPI DIGEST-MD5 CRAM-MD5 LOGIN PLAIN')dnl
 dnl #
 dnl # Rudimentary information on creating certificates for sendmail TLS:
 dnl #     make -C /usr/share/ssl/certs usage
@@ -134,20 +134,27 @@
 dnl # The following example makes mail from this host and any additional
 dnl # specified domains appear to be sent from mydomain.com
 dnl #
-dnl MASQUERADE_AS(`mydomain.com')dnl
+MASQUERADE_AS(`m-j-s.net')
 dnl #
 dnl # masquerade not just the headers, but the envelope as well
 dnl #
-dnl FEATURE(masquerade_envelope)dnl
+FEATURE(masquerade_envelope)
 dnl #
 dnl # masquerade not just @mydomainalias.com, but @*.mydomainalias.com as well
 dnl #
-dnl FEATURE(masquerade_entire_domain)dnl
+FEATURE(masquerade_entire_domain)
 dnl #
-dnl MASQUERADE_DOMAIN(localhost)dnl
-dnl MASQUERADE_DOMAIN(localhost.localdomain)dnl
-dnl MASQUERADE_DOMAIN(mydomainalias.com)dnl
-dnl MASQUERADE_DOMAIN(mydomain.lan)dnl
+MASQUERADE_DOMAIN(localhost)
+MASQUERADE_DOMAIN(localhost.localdomain)
+MASQUERADE_DOMAIN(m-j-s.net)
+MASQUERADE_DOMAIN(mjsb.net)
+MASQUERADE_DOMAIN(orodruin.mjsb.net)
+
+dnl # For masquerading
+FEATURE(`genericstable')
+FEATURE(`generics_entire_domain')
+GENERICS_DOMAIN(mjsb.net)
+
 
 MAILER(smtp)
 MAILER(procmail)

Update of /cvsroot/fidogate/fidogate
In directory sc8-pr-cvs1:/tmp/cvs-serv10848

Modified Files:
	ChangeLog 
Log Message:
See ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fidogate/fidogate/ChangeLog,v
retrieving revision 4.312
retrieving revision 4.313
diff -u -d -r4.312 -r4.313
--- ChangeLog	18 Jun 2003 18:45:54 -0000	4.312
+++ ChangeLog	18 Jun 2003 18:54:00 -0000	4.313
@@ -2,6 +2,10 @@
 
 	------- CVS ci -------------------------------------------------------
 
+	* sendmail/cf/mycfpost: changed output order, new rule first.
+
+	------- CVS ci -------------------------------------------------------
+
 	* sendmail/cf/mycfpost: post processor for .cf files generated
 	  with m4, adds some special rules.
 	  This script adds an extra rule to SParse1, which tries to match

Update of /cvsroot/fidogate/fidogate/sendmail/cf
In directory sc8-pr-cvs1:/tmp/cvs-serv10848/sendmail/cf

Modified Files:
	mycfpost 
Log Message:
See ChangeLog

Index: mycfpost
===================================================================
RCS file: /cvsroot/fidogate/fidogate/sendmail/cf/mycfpost,v
retrieving revision 4.1
retrieving revision 4.2
diff -u -d -r4.1 -r4.2
--- mycfpost	18 Jun 2003 18:45:54 -0000	4.1
+++ mycfpost	18 Jun 2003 18:54:00 -0000	4.2
@@ -53,10 +53,10 @@
 ##### main ###################################################################
 
 while(<>) {
-    print;
     if(/\Q$MATCH1\E/) {
 	print $SUBST1, "\n";
     }
+    print;
 }
 
 exit 0;

Update of /cvsroot/fidogate/fidogate/sendmail/cf
In directory sc8-pr-cvs1:/tmp/cvs-serv9584/sendmail/cf

Modified Files:
	Makefile 
Added Files:
	mycfpost 
Log Message:
See ChangeLog

--- NEW FILE: mycfpost ---
#!/usr/bin/perl
##############################################################################
#
# $Id: mycfpost,v 4.1 2003/06/18 18:45:54 n0ll Exp $
#
# FIDOGATE
#
# mycfpost --- sendmail .cf post processor
#
##############################################################################

use strict;

my $PROGRAM = 'mycfpost';
my $VERSION = '$Revision: 4.1 $ ';


use Getopt::Std;


my $MATCH1  = '< @ $* $={VirtHost} . >';




##### options ################################################################
use vars qw($opt_v $opt_h $opt_x);
getopts('vhx:');

if($opt_h) {
    print STDERR
      "\n",
      "$PROGRAM --- sendmail .cf post processor\n",
      "\n",
      "Usage:   $PROGRAM [-vh] [-x SUB] FILE ...\n",
      "\n",
      "Options:           -v        verbose\n",
      "                   -h        this help\n",
      "                   -x SUB    sub domain for VirtHost rule\n",
      "\n";
    exit 1;
}

my $SUB = $opt_x ? $opt_x : 'x';

my $SUBST1 =
'R<!> $+ < @ $* ' . $SUB . 
' . $={VirtHost} . > 	$: < $(virtuser $1 @ ' . $SUB . 
' . $3 $@ $1 $: @ $) > $1 < @ $2 $3 . >';



##### main ###################################################################

while(<>) {
    print;
    if(/\Q$MATCH1\E/) {
	print $SUBST1, "\n";
    }
}

exit 0;

Index: Makefile
===================================================================
RCS file: /cvsroot/fidogate/fidogate/sendmail/cf/Makefile,v
retrieving revision 4.17
retrieving revision 4.18
diff -u -d -r4.17 -r4.18
--- Makefile	18 Jun 2003 14:18:25 -0000	4.17
+++ Makefile	18 Jun 2003 18:45:54 -0000	4.18
@@ -33,6 +33,10 @@
 redhat7:	redhat7-orodruin.cf
 redhat9:	redhat9-orodruin.cf redhat9-submit.cf redhat9-morannon.cf
 
+redhat9-morannon.cf:	redhat9-morannon.mc
+		$(M4) $(M4OPTIONS) $< | ./mycfpost >$*.cf
+
+
 
 install:
 

Update of /cvsroot/fidogate/fidogate
In directory sc8-pr-cvs1:/tmp/cvs-serv9584

Modified Files:
	ChangeLog update-morannon 
Log Message:
See ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/fidogate/fidogate/ChangeLog,v
retrieving revision 4.311
retrieving revision 4.312
diff -u -d -r4.311 -r4.312
--- ChangeLog	9 Jun 2003 12:10:56 -0000	4.311
+++ ChangeLog	18 Jun 2003 18:45:54 -0000	4.312
@@ -1,3 +1,16 @@
+2003-06-18  Martin Junius  <mj...@m-...>
+
+	------- CVS ci -------------------------------------------------------
+
+	* sendmail/cf/mycfpost: post processor for .cf files generated
+	  with m4, adds some special rules.
+	  This script adds an extra rule to SParse1, which tries to match
+	  all @SOMETHING.x.virtdomain as @x.virtdomain in virtusertable,
+	  pointing to one single mailbox.
+
+	* sendmail/cf/redhat9-morannon.mc: new config for morannon.fido.de
+	  with RedHat 9.
+
 2003-06-09  Martin Junius  <mj...@m-...>
 
 	======= Release 4.4.9 ================================================

Index: update-morannon
===================================================================
RCS file: /cvsroot/fidogate/fidogate/update-morannon,v
retrieving revision 4.7
retrieving revision 4.8
diff -u -d -r4.7 -r4.8
--- update-morannon	15 Apr 2003 18:45:21 -0000	4.7
+++ update-morannon	18 Jun 2003 18:45:54 -0000	4.8
@@ -40,4 +40,4 @@
 lftp -c "open ftp://upload.sourceforge.net/incoming; $put"
 
 # metalab.unc.edu
-lftp -c "open ftp://metalab.unc.edu/incoming/Linux; $put"
+lftp -c "open ftp://metalab.unc.edu/incoming/linux; $put"

Update of /cvsroot/fidogate/fidogate/sendmail/cf
In directory sc8-pr-cvs1:/tmp/cvs-serv350/sendmail/cf

Modified Files:
	Makefile 
Added Files:
	redhat9-morannon.mc 
Log Message:
See ChangeLog

--- NEW FILE: redhat9-morannon.mc ---
divert(-1)dnl
dnl #
dnl # This is the sendmail macro config file for m4. If you make changes to
dnl # /etc/mail/sendmail.mc, you will need to regenerate the
dnl # /etc/mail/sendmail.cf file by confirming that the sendmail-cf package is
dnl # installed and then performing a
dnl #
dnl #     make -C /etc/mail
dnl #
include(`../m4/cf.m4')dnl
VERSIONID(`setup for Red Hat Linux')dnl
OSTYPE(`linux')dnl

define(`confCF_VERSION', `redhat9-morannon-1.1')
define(`confMIME_FORMAT_ERRORS', `False')
define(`confDEF_USER_ID',``8:12'')dnl
define(`confTRUSTED_USER', `smmsp')dnl
dnl define(`confAUTO_REBUILD')dnl
define(`confTO_CONNECT', `1m')dnl
define(`confDONT_PROBE_INTERFACES',true)
define(`confTRY_NULL_MX_LIST',true)dnl
define(`PROCMAIL_MAILER_PATH',`/usr/bin/procmail')dnl
define(`ALIAS_FILE', `/etc/aliases')dnl
dnl define(`STATUS_FILE', `/etc/mail/statistics')dnl
define(`UUCP_MAILER_MAX', `2000000')dnl
define(`confUSERDB_SPEC', `/etc/mail/userdb.db')dnl
define(`confPRIVACY_FLAGS', `authwarnings,novrfy,noexpn,restrictqrun')dnl
define(`confAUTH_OPTIONS', `A')dnl

dnl # no postmaster notify
define(`confDOUBLE_BOUNCE_ADDRESS', `')
undefine(`confCOPY_ERRORS_TO')

dnl #
dnl # The following allows relaying if the user authenticates, and disallows
dnl # plaintext authentication (PLAIN/LOGIN) on non-TLS links
dnl #
dnl define(`confAUTH_OPTIONS', `A p')dnl
dnl # 
dnl # PLAIN is the preferred plaintext authentication method and used by
dnl # Mozilla Mail and Evolution, though Outlook Express and other MUAs do
dnl # use LOGIN. Other mechanisms should be used if the connection is not
dnl # guaranteed secure.
dnl #
dnl TRUST_AUTH_MECH(`EXTERNAL DIGEST-MD5 CRAM-MD5 LOGIN PLAIN')dnl
dnl define(`confAUTH_MECHANISMS', `EXTERNAL GSSAPI DIGEST-MD5 CRAM-MD5 LOGIN PLAIN')dnl
dnl #
dnl # Rudimentary information on creating certificates for sendmail TLS:
dnl #     make -C /usr/share/ssl/certs usage
dnl #
dnl define(`confCACERT_PATH',`/usr/share/ssl/certs')
dnl define(`confCACERT',`/usr/share/ssl/certs/ca-bundle.crt')
dnl define(`confSERVER_CERT',`/usr/share/ssl/certs/sendmail.pem')
dnl define(`confSERVER_KEY',`/usr/share/ssl/certs/sendmail.pem')
dnl #
dnl # This allows sendmail to use a keyfile that is shared with OpenLDAP's
dnl # slapd, which requires the file to be readble by group ldap
dnl #
dnl define(`confDONT_BLAME_SENDMAIL',`groupreadablekeyfile')dnl
dnl #
dnl define(`confTO_QUEUEWARN', `4h')dnl
dnl define(`confTO_QUEUERETURN', `5d')dnl
dnl define(`confQUEUE_LA', `12')dnl
dnl define(`confREFUSE_LA', `18')dnl
define(`confTO_IDENT', `0')dnl
dnl FEATURE(delay_checks)dnl
FEATURE(`no_default_msa',`dnl')dnl
FEATURE(`smrsh',`/usr/sbin/smrsh')dnl

FEATURE(`mailertable',`hash -o /etc/mail/mailertable.db')
FEATURE(`virtusertable',`hash -o /etc/mail/virtusertable.db')
FEATURE(`virtuser_entire_domain')
VIRTUSER_DOMAIN_FILE(`/etc/mail/virtdomains')

FEATURE(redirect)dnl
FEATURE(always_add_domain)dnl
FEATURE(use_cw_file)dnl
FEATURE(use_ct_file)dnl
dnl #
dnl # The -t option will retry delivery if e.g. the user runs over his quota.
dnl #
FEATURE(local_procmail,`',`procmail -t -Y -a $h -d $u')dnl
FEATURE(`access_db',`hash -T<TMPF> -o /etc/mail/access.db')dnl
FEATURE(`blacklist_recipients')dnl
EXPOSED_USER(`root')dnl

dnl # DNS not always online
FEATURE(nocanonify)
define(`confDIRECT_SUBMISSION_MODIFIERS', `C')
define(`confBIND_OPTS', `-DNSRCH -DEFNAMES')

dnl #
dnl # The following causes sendmail to only listen on the IPv4 loopback address
dnl # 127.0.0.1 and not on any other network devices. Remove the loopback
dnl # address restriction to accept email from the internet or intranet.
dnl #
dnl DAEMON_OPTIONS(`Port=smtp,Addr=127.0.0.1, Name=MTA')dnl
dnl #
dnl # The following causes sendmail to additionally listen to port 587 for
dnl # mail from MUAs that authenticate. Roaming users who can't reach their
dnl # preferred sendmail daemon due to port 25 being blocked or redirected find
dnl # this useful.
dnl #
dnl DAEMON_OPTIONS(`Port=submission, Name=MSA, M=Ea')dnl
dnl #
dnl # The following causes sendmail to additionally listen to port 465, but
dnl # starting immediately in TLS mode upon connecting. Port 25 or 587 followed
dnl # by STARTTLS is preferred, but roaming clients using Outlook Express can't
dnl # do STARTTLS on ports other than 25. Mozilla Mail can ONLY use STARTTLS
dnl # and doesn't support the deprecated smtps; Evolution <1.1.1 uses smtps
dnl # when SSL is enabled-- STARTTLS support is available in version 1.1.1.
dnl #
dnl # For this to work your OpenSSL certificates must be configured.
dnl #
dnl DAEMON_OPTIONS(`Port=smtps, Name=TLSMTA, M=s')dnl
dnl #
dnl # The following causes sendmail to additionally listen on the IPv6 loopback
dnl # device. Remove the loopback address restriction listen to the network.
dnl #
dnl # NOTE: binding both IPv4 and IPv6 daemon to the same port requires
dnl #       a kernel patch
dnl #
dnl DAEMON_OPTIONS(`port=smtp,Addr=::1, Name=MTA-v6, Family=inet6')dnl
dnl #
dnl # We strongly recommend not accepting unresolvable domains if you want to
dnl # protect yourself from spam. However, the laptop and users on computers
dnl # that do not have 24x7 DNS do need this.
dnl #
dnl FEATURE(`accept_unresolvable_domains')dnl
dnl #
dnl FEATURE(`relay_based_on_MX')dnl
dnl # 
dnl # Also accept email sent to "localhost.localdomain" as local email.
dnl # 
LOCAL_DOMAIN(`localhost.localdomain')dnl
dnl #
dnl # The following example makes mail from this host and any additional
dnl # specified domains appear to be sent from mydomain.com
dnl #
dnl MASQUERADE_AS(`mydomain.com')dnl
dnl #
dnl # masquerade not just the headers, but the envelope as well
dnl #
dnl FEATURE(masquerade_envelope)dnl
dnl #
dnl # masquerade not just @mydomainalias.com, but @*.mydomainalias.com as well
dnl #
dnl FEATURE(masquerade_entire_domain)dnl
dnl #
dnl MASQUERADE_DOMAIN(localhost)dnl
dnl MASQUERADE_DOMAIN(localhost.localdomain)dnl
dnl MASQUERADE_DOMAIN(mydomainalias.com)dnl
dnl MASQUERADE_DOMAIN(mydomain.lan)dnl

MAILER(smtp)
MAILER(procmail)
MAILER(ftn)
MAILER(ffx)


LOCAL_CONFIG

Index: Makefile
===================================================================
RCS file: /cvsroot/fidogate/fidogate/sendmail/cf/Makefile,v
retrieving revision 4.16
retrieving revision 4.17
diff -u -d -r4.16 -r4.17
--- Makefile	26 Apr 2003 16:35:06 -0000	4.16
+++ Makefile	18 Jun 2003 14:18:25 -0000	4.17
@@ -31,12 +31,12 @@
 
 redhat6:	redhat6-morannon.cf
 redhat7:	redhat7-orodruin.cf
-redhat9:	redhat9-orodruin.cf redhat9-submit.cf
+redhat9:	redhat9-orodruin.cf redhat9-submit.cf redhat9-morannon.cf
 
 
 install:
 
-install-redhat9:
+install-orodruin:
 		$(INSTALL) -c -o root -g root -m 444 redhat9-orodruin.mc \
 		  /etc/mail/sendmail.mc
 		$(INSTALL) -c -o root -g root -m 444 redhat9-orodruin.cf \
@@ -45,6 +45,12 @@
 		  /etc/mail/submit.mc
 		$(INSTALL) -c -o root -g root -m 444 redhat9-submit.cf \
 		  /etc/mail/submit.cf
+
+install-morannon:
+		$(INSTALL) -c -o root -g root -m 444 redhat9-morannon.mc \
+		  /etc/mail/sendmail.mc
+		$(INSTALL) -c -o root -g root -m 444 redhat9-morannon.cf \
+		  /etc/mail/sendmail.cf
 
 
 clean:

Update of /cvsroot/fidogate/fidogate/src/gate
In directory sc8-pr-cvs1:/tmp/cvs-serv23681/src/gate

Modified Files:
	send-fidogate.sh 
Log Message:
See ChangeLog

Index: send-fidogate.sh
===================================================================
RCS file: /cvsroot/fidogate/fidogate/src/gate/send-fidogate.sh,v
retrieving revision 4.3
retrieving revision 4.4
diff -u -d -r4.3 -r4.4
--- send-fidogate.sh	8 Jun 2003 21:01:26 -0000	4.3
+++ send-fidogate.sh	9 Jun 2003 12:10:57 -0000	4.4
@@ -62,8 +62,8 @@
 
     echo "${PROGNAME}: [$$] begin ${SITE}"
 
-    case $VERSION in
-    INN 2.2*)
+    case "$VERSION" in
+    "INN 2.2"*)
 	# optimized version for INN 2.2, no longer works with INN 2.3
 	time $RFC2FTN -f $BATCHFILE -m 500
 	;;