From owner-freebsd-current  Wed Dec  3 10:03:50 1997
Return-Path: <owner-freebsd-current>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id KAA29514
          for current-outgoing; Wed, 3 Dec 1997 10:03:50 -0800 (PST)
          (envelope-from owner-freebsd-current)
Received: from ns1.yes.no (ns1.yes.no [195.119.24.10])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id KAA29507
          for <current@FreeBSD.ORG>; Wed, 3 Dec 1997 10:03:45 -0800 (PST)
          (envelope-from eivind@bitbox.follo.net)
Received: from bitbox.follo.net (bitbox.follo.net [194.198.43.36])
	by ns1.yes.no (8.8.7/8.8.7) with ESMTP id SAA14728;
	Wed, 3 Dec 1997 18:03:35 GMT
Received: (from eivind@localhost)
	by bitbox.follo.net (8.8.6/8.8.6) id TAA22704;
	Wed, 3 Dec 1997 19:03:34 +0100 (MET)
Date: Wed, 3 Dec 1997 19:03:34 +0100 (MET)
Message-Id: <199712031803.TAA22704@bitbox.follo.net>
From: Eivind Eklund <perhaps@yes.no>
To: jak@cetlink.net (John Kelly)
CC: jkh@time.cdrom.com, current@FreeBSD.ORG
In-reply-to: jak@cetlink.net's message of Wed, 03 Dec 1997 04:10:26 GMT
Subject: Re: 3.0 -release ? 
References: <1254.881054658@time.cdrom.com>
	<3485dac6.74174125@mail.cetlink.net>
Sender: owner-freebsd-current@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

> 
> On Tue, 02 Dec 1997 01:24:18 -0800, "Jordan K. Hubbard"
> <jkh@time.cdrom.com> wrote:
> 
> >> Any guesses as to when is 3.0 -release is going
> 
> >Sometime in the spring of 1998.  And that's as specific as I'm
> >going to get. :)
> 
> What's the hurry?  NATD falls over on my 3.0, pretty current.  I
> haven't had a chance yet to compare 2.2-stable.

Problem both places, methinks.  See if the following fixes it (from
aage@aage.priv.no):

--- /tmp/natd.c Tue Dec  2 22:24:53 1997
+++ /usr/src/usr.sbin/natd/natd.c       Wed Oct 29 22:11:32 1997
@@ -1332,7 +1332,7 @@
 
        port = strtol (str, &end, 10);
        if (end != str)
-               return htonl (port);
+               return htons (port);
 
        sp = getservbyname (str, proto);
        if (!sp)

If it does, I'll commit it - it looks correct, and I've got one other
favourable report :-)

Eivind.