Reverted my work on the 'originated locally' field. I found a much simpler way to...

diff --git a/citadel/docs/databaselayout.txt b/citadel/docs/databaselayout.txt
index 97c14f8d528d1aff363201d91a20b841fc00d652..3eafb64eee88fb8ed1caf4a6f50241e508f93a70 100644 (file)
--- a/citadel/docs/databaselayout.txt
+++ b/citadel/docs/databaselayout.txt
@@ -245,9 +245,6 @@ reaches zero.
 | L     |    eListID        | list | List-ID        |  Mailing list identification, as per RFC 2919
 | M     |    eMesageText    | text | Message Text   |  Normal ASCII, newlines seperated by CR's or LF's,
 |       |                   |      |                |  null terminated as always.
-| N     |    eOrigLocal     | locl | Is-Local       |  The presence of this field indicates that the message
-|       |                   |      |                |  originated on the local Citadel node, not as an inbound
-|       |                   |      |                |  email or some other outside source.
 | O     |    eOriginalRoom  | room | Room           |  Room of origin.
 | P     |    eMessagePath   | path | Path           |  Complete path of message, as in the UseNet news
 |       |                   |      |                |  standard.  A user should be able to send Internet mail
@@ -286,6 +283,9 @@ reaches zero.
 | 2     |    eExtnotify     |      | extnotify      |  Used internally by the serv_extnotify module.
 | 3     |    eVltMsgNum     |      | msgnum         |  Used internally to pass the local message number in the
 |       |                   |      |                |  database to after-save hooks.  Discarded afterwards.
+|       |                   | locl |                |  The presence of this field indicates that the message
+|       |                   |      |                |  is believed to have originated on the local Citadel node,
+|       |                   |      |                |  not as an inbound email or some other outside source.
 
 EXAMPLE
 -------

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 9f24a46ee390c4afa291baabb2858d9014378f03..11cefd808ee6ba52bdfd10a1a381d90326dc0ccf 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -1418,7 +1418,8 @@ void directory_key(char *key, char *addr) {
 }
 
 
-/* Return nonzero if the supplied address is in one of "our" domains
+/*
+ * Return nonzero if the supplied address is in one of "our" domains
  */
 int IsDirectory(char *addr, int allow_masq_domains) {
        char domain[256];

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index bf18da7447b0e2323e4cfbc74aad76235ad4f876..8ebb91911d23086cb8cc1e6c343bcbda1e0bdd5f 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -61,7 +61,7 @@ char *msgkeys[] = {
        "rep2", // K -> eReplyTo
        "list", // L -> eListID
        "text", // M -> eMesageText
-       "locl", // N -> eOrigLocal
+       NULL,   // N (formerly used as eNodename)
        "room", // O -> eOriginalRoom
        "path", // P -> eMessagePath
        NULL,   // Q
@@ -113,7 +113,6 @@ eMsgField FieldOrder[]  = {
        eOriginalRoom,
        eRecipient   ,
 /* Semi-important fields */
-       eOrigLocal   ,
        eBig_message ,
        eExclusiveID ,
        eWeferences  ,
@@ -1857,7 +1856,6 @@ void OutputRFC822MsgHeaders(
                        case eSuppressIdx:
                        case eExtnotify:
                        case eVltMsgNum:
-                       case eOrigLocal:
                                /* these don't map to mime message headers. */
                                break;
                        }

diff --git a/citadel/server.h b/citadel/server.h
index bac82875c9f11cedc588aada798ce526dbc89557..9215d2e7e9c614b3d483afdf39f8db8660d86c36 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -317,7 +317,6 @@ typedef enum _MsgField {
        eReplyTo      = 'K',
        eListID       = 'L',
        eMesageText   = 'M',
-       eOrigLocal    = 'N',
        eOriginalRoom = 'O',
        eMessagePath  = 'P',
        eRecipient    = 'R',