- Removed PacketAliasPptp() API function.

- SHLIB_MAJOR++.

4 files changed, 1 insertions, 38 deletions

diff --git a/sys/netinet/libalias/Makefile b/sys/netinet/libalias/Makefile
index 3208014..2ee0675 100644
--- a/sys/netinet/libalias/Makefile
+++ b/sys/netinet/libalias/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=		alias
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 SHLIB_MINOR=	0
 CFLAGS+=	-Wall -I${.CURDIR}
 SRCS=		alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \
diff --git a/sys/netinet/libalias/alias.h b/sys/netinet/libalias/alias.h
index ace911d..61f759f 100644
--- a/sys/netinet/libalias/alias.h
+++ b/sys/netinet/libalias/alias.h
@@ -56,9 +56,6 @@ struct alias_link;
                          struct in_addr addr,
                          u_short port);
 
-    extern int
-    PacketAliasPptp(struct in_addr);
-
     extern struct alias_link *
     PacketAliasRedirectProto(struct in_addr,
                              struct in_addr,
diff --git a/sys/netinet/libalias/alias_db.c b/sys/netinet/libalias/alias_db.c
index 408fcdd..7fb3b28 100644
--- a/sys/netinet/libalias/alias_db.c
+++ b/sys/netinet/libalias/alias_db.c
@@ -2239,20 +2239,6 @@ PacketAliasAddServer(struct alias_link *link, struct in_addr addr, u_short port)
 	return (-1);
 }
 
-/* Translate PPTP packets to a machine on the inside
- * XXX This function is made obsolete by PacketAliasRedirectProto().
- */
-int
-PacketAliasPptp(struct in_addr src_addr)
-{
-
-    if (src_addr.s_addr != INADDR_NONE)
-	(void)PacketAliasRedirectProto(src_addr, nullAddress, nullAddress,
-				       IPPROTO_GRE);
-
-    return 1;
-}
-
 /* Redirect packets of a given IP protocol from a specific
    public address to a private address */
 struct alias_link *
diff --git a/sys/netinet/libalias/libalias.3 b/sys/netinet/libalias/libalias.3
index 53c0d6b..4c06d98 100644
--- a/sys/netinet/libalias/libalias.3
+++ b/sys/netinet/libalias/libalias.3
@@ -680,26 +680,6 @@ If
 .Dv NULL
 is returned, then the function call did not complete successfully.
 .Ed
-.Pp
-.Ft int
-.Fn PacketAliasPptp "struct in_addr addr"
-.Bd -ragged -offset indent
-This function causes any PPTP packets to be aliased using
-.Fa addr
-rather than the address set via
-.Fn PacketAliasSetAddress .
-This allows the uses of the PPTP on a single machine on the internal network.
-.Pp
-If the passed address is
-.Dv INADDR_NONE ,
-then PPTP aliasing is disabled.
-.Pp
-.Bf -symbolic
-This function is made obsolete by
-.Fn PacketAliasRedirectProto ,
-and is provided only for backward compatibility.
-.Ef
-.Ed
 .Sh FRAGMENT HANDLING
 The functions in this section are used to deal with incoming fragments.
 .Pp