From c91fce455cc6e768670e8b9e28bd3d6c3058c1dd Mon Sep 17 00:00:00 2001
From: "Alexander S. Aganichev" <asa@eed.miee.ru>
Date: Thu, 6 Dec 2001 08:32:55 +0000
Subject: [PATCH] Fixed UUCP-gating

---
 golded3/gehdre.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/golded3/gehdre.cpp b/golded3/gehdre.cpp
index 27a5510..af9e2d8 100644
--- a/golded3/gehdre.cpp
+++ b/golded3/gehdre.cpp
@@ -366,7 +366,7 @@ int EditHeaderinfo(int mode, GMsgHeaderView &view, bool doedithdr) {
   }
   else {
     to_name = (*msg->iaddr and not *msg->igate) ? msg->iaddr : msg->to;
-    if(msg->dest.net)
+    if(msg->dest.valid())
       msg->dest.make_string(to_addr, msg->ddom);
   }
   subject = msg->re;
@@ -405,7 +405,7 @@ int EditHeaderinfo(int mode, GMsgHeaderView &view, bool doedithdr) {
     hedit.start_id = GMsgHeaderEdit::id_to_name;
     switch(mode) {
       case MODE_REPLYCOMMENT:
-        if(not (msg->dest.net or not AA->isnet()))
+        if(not (msg->dest.valid() or not AA->isnet()))
           break;
         // else drop through ...
       case MODE_REPLY:
@@ -478,9 +478,9 @@ int EditHeaderinfo(int mode, GMsgHeaderView &view, bool doedithdr) {
       }
       else
         strcpy(msg->ito, msg->idest);
-      if(msg->orig.net == 0)
+      if(not msg->orig.valid())
         msg->orig = msg->oorig = AA->Aka().addr;
-      if(msg->dest.net == 0)
+      if(not msg->dest.valid())
         msg->dest = msg->odest = AA->Internetgate().addr;
     }
     else {
@@ -538,8 +538,8 @@ int EditHeaderinfo(int mode, GMsgHeaderView &view, bool doedithdr) {
       }
 
       if(to_addr.empty()) {
-        // Set destination to yourself or the Boss node
-        address = msg->orig;
+        // Set destination to yourself, the Boss node, or UUCP gate address
+        address = msg->dest.valid() ? msg->dest : msg->orig;
         address.point = 0;
         address.make_string(to_addr);
       }