aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2000-06-20 12:52:27 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2000-06-20 12:52:27 +0000
commitdc1a022582d0207ea2e1353759163371ae3ad84c (patch)
tree79c767debade6657e84317b08f7bfc695bf0c5d4 /sbin
parent86c5e1ea4da1fd1b4499b998b2cc58a98d5d1ccd (diff)
downloadsrc-dc1a022582d0207ea2e1353759163371ae3ad84c.tar.gz
src-dc1a022582d0207ea2e1353759163371ae3ad84c.zip
Remove ``pptpalias'' since this is now done transparently by libalias(3).
Notes
Notes: svn path=/head/; revision=61864
Diffstat (limited to 'sbin')
-rw-r--r--sbin/natd/natd.819
-rw-r--r--sbin/natd/natd.c33
2 files changed, 1 insertions, 51 deletions
diff --git a/sbin/natd/natd.8 b/sbin/natd/natd.8
index 9f8322f72c8f..12cb27f1bcec 100644
--- a/sbin/natd/natd.8
+++ b/sbin/natd/natd.8
@@ -42,7 +42,6 @@ Network Address Translation Daemon
.Op Fl reverse
.Op Fl proxy_only
.Op Fl proxy_rule Ar proxyspec
-.Op Fl pptpalias Ar localIP
.Sh DESCRIPTION
This program provides a Network Address Translation facility for use
@@ -377,22 +376,6 @@ Use
to put this information into the IP option field or
.Dq encode_tcp_stream
to inject the data into the beginning of the TCP stream.
-
-.It Fl pptpalias Ar localIP
-Allow PPTP packets to go to the defined localIP address.
-PPTP is a VPN or secure
-IP tunneling technology being developed primarily by Microsoft.
-For its encrypted traffic,
-it uses an old IP encapsulation protocol called GRE (47).
-This natd option will translate any traffic of this protocol to a
-single, specified IP address.
-This would allow either one client or one server
-to be serviced with natd.
-If you are setting up a server, don't forget to allow the TCP traffic
-for the PPTP setup.
-For a client or server,
-you must allow GRE (protocol 47) if you have firewall lists active.
-
.El
.Sh RUNNING NATD
@@ -529,6 +512,6 @@ times:
.An Ari Suutari Aq suutari@iki.fi
(natd)
.An Dru Nelson Aq dnelson@redwoodsoft.com
-(PPTP support)
+(early PPTP support)
.An Brian Somers Aq brian@awfulhak.org
(glue)
diff --git a/sbin/natd/natd.c b/sbin/natd/natd.c
index 39aeafc91d2a..2f45af525083 100644
--- a/sbin/natd/natd.c
+++ b/sbin/natd/natd.c
@@ -91,7 +91,6 @@ static void ReadConfigFile (const char* fileName);
static void SetupPortRedirect (const char* parms);
static void SetupProtoRedirect(const char* parms);
static void SetupAddressRedirect (const char* parms);
-static void SetupPptpAlias (const char* parms);
static void StrToAddr (const char* str, struct in_addr* addr);
static u_short StrToPort (const char* str, const char* proto);
static int StrToPortRange (const char* str, const char* proto, port_range *portRange);
@@ -867,7 +866,6 @@ enum Option {
RedirectAddress,
ConfigFile,
DynamicMode,
- PptpAlias,
ProxyRule,
LogDenied,
LogFacility
@@ -1058,14 +1056,6 @@ static struct OptionInfo optionTable[] = {
"redirect_address",
NULL },
- { PptpAlias,
- 0,
- String,
- "src",
- "define inside machine for PPTP traffic",
- "pptpalias",
- NULL },
-
{ ConfigFile,
0,
String,
@@ -1231,10 +1221,6 @@ static void ParseOption (const char* option, const char* parms)
SetupAddressRedirect (strValue);
break;
- case PptpAlias:
- SetupPptpAlias (strValue);
- break;
-
case ProxyRule:
PacketAliasProxyRule (strValue);
break;
@@ -1356,25 +1342,6 @@ static void Usage ()
exit (1);
}
-void SetupPptpAlias (const char* parms)
-{
- char buf[128];
- char* ptr;
- struct in_addr srcAddr;
-
- strcpy (buf, parms);
-
-/*
- * Extract source address.
- */
- ptr = strtok (buf, " \t");
- if (!ptr)
- errx(1, "pptpalias: missing src address");
-
- StrToAddr (ptr, &srcAddr);
- PacketAliasPptp (srcAddr);
-}
-
void SetupPortRedirect (const char* parms)
{
char buf[128];