* netproc.c: msgfind() no longer uses the timestamp as a message-ID

          when no other message-ID is available (it screws up the loopzapper)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index cb8e122d8cda8780d106349e5e1676d9a81540b9..9b417e8839563ddecec50fba362a4a12a8faac6c 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jul 11 18:46:48 EDT 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
+       * netproc.c: msgfind() no longer uses the timestamp as a message-ID
+         when no other message-ID is available (it screws up the loopzapper)
+
 Wed Jul  7 23:25:09 EDT 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * control.c: create citadel.control if it doesn't exist (yikes!)
        * serv_expire.c: purge mailbox rooms belonging to non-existent users

diff --git a/citadel/netproc.c b/citadel/netproc.c
index 7875fbc576e51657664f8b61b1cdbab26547d75f..52ede044a24deace1aaca97414d59d0b999247ca 100644 (file)
--- a/citadel/netproc.c
+++ b/citadel/netproc.c
@@ -413,10 +413,13 @@ int is_banned(char *k_person, char *k_room, char *k_system)
        return (0);
 }
 
-int get_sysinfo_type(char *name)
-{                              /* determine routing from sysinfo file */
+/*
+ * Determine routing from sysinfo file
+ */
+int get_sysinfo_type(char *name) {
        struct syslist *stemp;
-      GETSN:for (stemp = slist; stemp != NULL; stemp = stemp->next) {
+
+GETSN: for (stemp = slist; stemp != NULL; stemp = stemp->next) {
                if (!strcasecmp(stemp->s_name, name)) {
                        if (!strcasecmp(stemp->s_type, "use")) {
                                strcpy(name, stemp->s_nexthop);
@@ -486,7 +489,7 @@ void msgfind(char *msgfile, struct minfo *buffer)
        buffer->B[0] = 0;
        buffer->G[0] = 0;
 
-      BONFGM:b = getc(fp);
+BONFGM:        b = getc(fp);
        if (b < 0)
                goto END;
        if (b == 'M')
@@ -545,11 +548,22 @@ void msgfind(char *msgfile, struct minfo *buffer)
                strcpy(buffer->E, bbb);
        goto BONFGM;
 
-      END:if (buffer->I == 0L)
+END:   fclose(fp);
+
+       /* NOTE: we used to use the following two lines of code to assign
+        * the timestamp as a message-ID if there was no message-ID already
+        * in the message.  We don't do this anymore because it screws up
+        * the loopzapper.
+        *
+       if (buffer->I == 0L)
                buffer->I = buffer->T;
-       fclose(fp);
+        */
 }
 
+
+
+
+
 void ship_to(char *filenm, char *sysnm)
 {                              /* send spool file filenm to system sysnm */
        char sysflnm[100];