deprecated/e-smith-pptpd
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

initial commit of file from CVS for e-smith-pptpd on Wed 12 Jul 09:04:53 BST 2023

Browse Source
This commit is contained in:
Brian Read 2023-07-12 09:04:53 +01:00
parent 84706b10f8
commit d6305d2c67
66 changed files with 1924 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
*.rpm
*.log
*spec-20*
*.tar.xz

21
Makefile Normal file
View File

@ -0,0 +1,21 @@
# Makefile for source rpm: e-smith-pptpd
# $Id: Makefile,v 1.1 2016/02/05 21:58:35 stephdl Exp $
NAME := e-smith-pptpd
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

16
README.md
View File

@ -1,3 +1,17 @@
# e-smith-pptpd
# <img src="https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png" width="25%" vertical="auto" style="vertical-align:bottom"> e-smith-pptpd
SMEServer Koozali developed git repo for e-smith-pptpd smeserver
## Wiki
<br />https://wiki.koozali.org/
## Bugzilla
Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-pptpd&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
## Description
<br />*This description has been generated by an LLM AI system and cannot be relied on to be fully correct.*
*Once it has been checked, then this comment will be deleted*
<br />
The e-smith-pptpd software is an open source package for Linux and Unix-like systems that provides Point-to-Point Tunneling Protocol (PPTP) server capabilities. It is designed to be an easy-to-use solution for setting up a secure, remote access server that supports multiple clients. e-smith-pptpd provides robust security features such as encryption, authentication, and session management to ensure that all connected users are secure. Additionally, e-smith-pptpd is highly configurable and can be used to set up virtual private networks, restrict user access, and more. Overall, this software is an excellent choice for those looking to create a secure, remote access server for their network.

340
additional/COPYING Normal file
View File

@ -0,0 +1,340 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.

492
additional/e-smith-pptpd.spec Normal file
View File

@ -0,0 +1,492 @@
Summary: e-smith server and gateway - configure PPTP inbound VPN
%define name e-smith-pptpd
Name: %{name}
%define version 1.11.0
%define release 01
Version: %{version}
Release: %{release}
License: GPL
Group: Networking/Daemons
Packager: e-smith developers <bugs@e-smith.com>
Source: %{name}-%{version}.tar.gz
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
Requires: e-smith-base >= 4.13.16-27
Requires: pptpd
Requires: kernel => 2.4
Requires: e-smith-packetfilter >= 1.13.0-22
BuildRequires: e-smith-devtools
BuildArchitectures: noarch
%description
e-smith server and gateway - configure inbound PPTP VPN access
%changelog
* Mon Jan 19 2004 Michael Soulier <msoulier@e-smith.com>
- [1.11.0-01]
- rolling to dev - 1.11.0
* Wed Jul 9 2003 Charlie Brady <charlieb@e-smith.com>
- [1.10.0-02]
- Denylog inbound GRE unless pptpd is enabled. This allows
masquerade to work better. [charlieb 9249]
* Thu Jun 26 2003 Charlie Brady <charlieb@e-smith.com>
- [1.10.0-01]
- Changing version to stable stream number - 1.10.0
* Wed Jun 18 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-24]
- Enable ppp multilink, to help Win XP PPTP reliability [charlieb 9059]
* Wed Jun 18 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-23]
- Back out last change; it's required for address pool sharing. [charlieb 8874]
* Wed Jun 11 2003 Gordon Rowell <gordonr@e-smith.com>
- [1.9.0-22]
- Don't expand /etc/dhcpd.conf here - let the run script do it [gordonr 8883]
* Tue Jun 10 2003 Tony Clayton <apc@e-smith.com>
- [1.9.0-21]
- Fix pptpd.conf/remoteip fragment to use new StartIP property [tonyc 8883]
* Fri Jun 6 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-20]
- Fix runtime errors in last change, and add comment. [charlieb 8951]
* Fri Jun 6 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-19]
- Use esmith::ConfigDB::wins_server method to determine correct
wins server. [charlieb 8951]
* Tue Jun 3 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-18]
- Fix arithmetic in last change. [charlieb 8883]
* Tue Jun 3 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-17]
- Add comment to dhcpd.conf to show which addresses have been
"borrowed". Remove template fragment which generates static IP definitions
for pptpd "hostnames" (these aren't useful). [charlieb 8883]
* Tue Jun 3 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-16]
- Convert pptpd-conf script to use esmith::ConfigDB and remove use of
deprecated CONFREF.
- Expand dhcpd.conf in pptpd-conf script, to ensure that address range
is configured. [charlieb 8883]
* Tue Jun 3 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-15]
- Improve explicit subtraction of pptpd addresses from DHCP range. [charlieb 8883]
* Wed May 28 2003 Gordon Rowell <gordonr@e-smith.com>
- [1.9.0-14]
- Relocate chap-secrets fragment to e-smith-base [gordonr 8747]
* Wed May 28 2003 Gordon Rowell <gordonr@e-smith.com>
- [1.9.0-13]
- Relocate /etc/smbpasswd to /etc/samba/smbpasswd [gordonr 8747]
* Wed May 28 2003 Gordon Rowell <gordonr@e-smith.com>
- [1.9.0-12]
- Removed processing of /etc/ppp/chap-secrets, now done in ppp-conf-users [gordonr 8849]
- Removed creation of pptpd record - defaults fragments exist [gordonr 8849]
* Fri May 23 2003 Gordon Rowell <gordonr@e-smith.com>
- [1.9.0-11]
- Fixed createlinks [gordonr 4847]
* Fri May 23 2003 Gordon Rowell <gordonr@e-smith.com>
- [1.9.0-10]
- Reconfigure pptp in user-modify-admin [gordonr 4847]
* Fri May 23 2003 Gordon Rowell <gordonr@e-smith.com>
- [1.9.0-09]
- Rewrote chap-secrets fragment with new DB interface [gordonr 4847]
- Use VPNClientAccess instead of PPTPAccess [gordonr 4847]
* Tue May 13 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-08]
- Skip users unless PPTPAccess property of user is "yes". We don't want the
no/disabled ambiguity. [charlieb 4847]
* Tue May 6 2003 Mark Knox <markk@e-smith.com>
- [1.9.0-07]
- Call pptpd-conf in user-modify as well as create & delete [markk 4847]
- Skip users with PPTPAccess of 'off' or 'disabled' [markk 4847]
* Thu May 1 2003 Michael Soulier <msoulier@e-smith.com>
- [1.9.0-06]
- Added conf-masq and adjust-masq to ip-up.pptpd and ip-down events.
[msoulier 7695]
* Thu May 1 2003 Michael Soulier <msoulier@e-smith.com>
- [1.9.0-05]
- Fixed lack of /etc/ppp/ip-down.local file. [msoulier 7695]
- Removed iptables code from pptp-interface-access. It now sets an Interfaces
parameter in the pptpd record. [msoulier 7695]
- Updated requirements. [msoulier 7695]
* Tue Mar 18 2003 Lijie Deng <lijied@e-smith.com>
- [1.9.0-04]
- Deleted ./etc/pptpd.conf/template-begin [lijied 3295]
* Tue Mar 11 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-03]
- Don't create links to obsoleted pptpd-conf-startup in createlinks.
[charlieb 7526]
* Fri Mar 7 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-02]
- Gracefully handle undefined "sessions" property in hosts.allow fragment
[charlieb 5650]
- Move some db initiatisation into defaults directory fragments.
[charlieb 7526]
* Fri Mar 7 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-01]
- Roll to development stream to 1.9.0
* Fri Oct 11 2002 Charlie Brady <charlieb@e-smith.com>
- [1.8.0-01]
- Roll to maintained version number to 1.8.0
* Thu Oct 3 2002 Charlie Brady <charlieb@e-smith.com>
- [1.7.0-06]
- Fix buglet in debug template fragment. [charlieb 4278]
* Thu Oct 3 2002 Charlie Brady <charlieb@e-smith.com>
- [1.7.0-05]
- Add hosts.allow template fragment (for new wrappers enabled pptpd)
[charlieb 4278]
- Update /etc/ppp/options.pptpd template to match options available
with CVS version of pppd. Add property driven debug fragment
while we are at it [charlieb 4278]
* Wed Oct 2 2002 Charlie Brady <charlieb@e-smith.com>
- [1.7.0-04]
- Remove listen directive - all interfaces is the default, and new
pptpd segfaults on "listen 0.0.0.0". [charlieb 4797]
* Tue Sep 17 2002 Gordon Rowell <gordonr@e-smith.com>
- [1.7.0-03]
- Force re-tag of file from 1.7.0-02 [gordonr 4797]
* Mon Sep 16 2002 Gordon Rowell <gordonr@e-smith.com>
- [1.7.0-02]
- Listen on all interfaces to avoid race condition with external
interface configuration [gordonr 4797]
* Mon Sep 16 2002 Gordon Rowell <gordonr@e-smith.com>
- [1.7.0-01]
- Forced version update by co2rpm to 1.7.0
- Bumped version number - this is a development stream [gordonr 4501]
* Thu Sep 12 2002 Charlie Brady <charlieb@e-smith.com>
- [1.6.6-04]
- Fix destination address verification rules of gre-in rules. [charlieb 4501]
* Wed Sep 11 2002 Charlie Brady <charlieb@e-smith.com>
- [1.6.6-03]
- Add nomppe-40 option to prevent use of 40 bit encryption [charlieb 4278]
* Wed Sep 11 2002 Charlie Brady <charlieb@e-smith.com>
- [1.6.6-02]
- Roll back all PPP options changes so that we can use orig pppd binary.
[charlieb 4278]
* Wed Aug 28 2002 Charlie Brady <charlieb@e-smith.com>
- [1.6.6-01]
- Add action script to enable/disable unrestricted traffic on
an interface when PPTP comes up/goes down. [charlieb 4501]
* Wed Aug 28 2002 Charlie Brady <charlieb@e-smith.com>
- [1.6.5-01]
- Change allow_tcp_in calling sequence, to facilitate non-disruptive
change. [charlieb 4501]
- Add GRE rules which are run-time switchable [charlieb 4501]
* Thu Aug 8 2002 Charlie Brady <charlieb@e-smith.com>
- [1.5.5-01]
- Use allow_tcp_in() function in masq template fragment. [charlieb 4499]
* Wed Jul 31 2002 Charlie Brady <charlieb@e-smith.com>
- [1.5.4-01]
- Fix a few errors in the pptp PPP configuration. [charlieb 4278]
* Thu Jul 25 2002 Charlie Brady <charlieb@e-smith.com>
- [1.5.3-01]
- Use mschap and mppe configuration directives compatible with the latest
pppd (from CVS). [charlieb 4278]
* Tue Jul 23 2002 Charlie Brady <charlieb@e-smith.com>
- [1.5.2-01]
- Fix iptables usage - on OUTPUT chain, now use -o interface_name, not
-i interface_name. [charlieb 1268]
* Wed Jul 17 2002 Charlie Brady <charlieb@e-smith.com>
- [1.5.1-01]
- Change masq script fragment to use iptables. [charlieb 1268]
* Wed Jun 5 2002 Charlie Brady <charlieb@e-smith.com>
- [1.5.0-01]
- Changing version to development stream number - 1.5.0
* Mon May 27 2002 Charlie Brady <charlieb@e-smith.com>
- [1.4.5-01]
- Include pptpd-conf action in workgroup-update event, so that WINS setting is
added/deleted if required. [charlieb 3602]
* Thu May 23 2002 Gordon Rowell <gordonr@e-smith.com>
- [1.4.4-01]
- RPM rebuild forced by cvsroot2rpm
* Wed May 22 2002 Charlie Brady <charlieb@e-smith.com>
- [1.4.3-01]
- Grab samba domain master setting from smb service, not from SambaDomainMaster.
[charlieb 3160]
* Sat May 18 2002 Charlie Brady <charlieb@e-smith.com>
- [1.4.2-01]
- Add missing bootstrap-console-save event directory.
* Sat May 18 2002 Charlie Brady <charlieb@e-smith.com>
- [1.4.1-01]
- Test build to verify CVS conversion.
* Tue Dec 11 2001 Charlie Brady <charlieb@e-smith.com>
- [1.4.0-01]
- rollRPM: Rolled version number to 1.4.0-01. Includes patches up to 1.3.0-02.
* Tue Dec 11 2001 Charlie Brady <charlieb@e-smith.com>
- [1.3.0-02]
- Fix pptpd-restart so that it won't log FAILED when it tries to shut down
a pptpd which is not running.
* Mon Nov 12 2001 Charlie Brady <charlieb@e-smith.com>
- [1.3.0-01]
- Rolled version number to 1.3.0-01. Includes patches upto 1.2.0-09.
* Thu Oct 25 2001 Charlie Brady <charlieb@e-smith.com>
- [1.2.0-09]
- Add conf action to bootstrap-console-save event
* Fri Aug 17 2001 gordonr
- [1.2.0-08]
- Autorebuild by rebuildRPM
* Mon Jul 30 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.2.0-07]
- Don't check for /var/lock/subsys/pptpd - pptp is managed by init
and this lock file will not always be created
* Fri Jul 6 2001 Peter Samuel <peters@e-smith.com>
- [1.2.0-06]
- Including GPL license with package
* Sat Apr 28 2001 Charlie Brady <charlieb@e-smith.com>
- [1.2.0-05]
- Only advertise WINS address if configured as Samba Domain Master.
* Tue Apr 24 2001 Charlie Brady <charlieb@e-smith.com>
- [1.2.0-04]
- Fix problem in dhcpd.conf template with non C class addresses.
* Thu Feb 8 2001 Adrian Chung <adrianc@e-smith.com>
- [1.2.0-03]
- Rolling release number for GPG signing.
* Thu Jan 25 2001 Charlie Brady <charlieb@e-smith.com>
- [1.2.0-02]
- Add "ipparam pptpd" to ppp options file.
- Remove obsolete post-restore event.
- Removed %postun script.
* Thu Jan 25 2001 Peter Samuel <peters@e-smith.com>
- [1.2.0-01]
- Rolled version number to 1.2.0-01. Includes patches upto 1.1.0-29.
* Thu Jan 18 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-29]
- Allow admin to use PPTP
* Fri Jan 12 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-28]
- Users now have a property of PPTPAccess - defaults to allowed
Set to "off" to disable individual user access to PPTP
* Fri Jan 12 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-27]
- Backed out serviceControl() - it doesn't handle non-initscript startup yet
* Thu Jan 11 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-26]
- Fix call to serviceControl()
* Thu Jan 11 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-25]
- Use serviceControl()
* Thu Jan 11 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-24]
- Check pptpd status is defined in masq template
* Thu Jan 11 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-23]
- Set listenip to $LocalIP in serveronly mode - thanks Karl Ponsonby
* Thu Jan 11 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-22]
- Explictly list users in chap-secrets, but only if their password is set
* Thu Jan 11 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-21]
- Added /etc/ppp/ip-up.local
* Thu Jan 11 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-20]
- /etc/ppp/chap-secrets is required for pptp
* Thu Jan 11 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-19]
- Fixed remoteip calculation - missing pptpd/sessions
* Sun Jan 07 2001 Charlie Brady <charlieb@e-smith.com>
- [1.1.0-18]
- Fix remote address calculation in /etc/pptpd.conf
- Disable deflate and bsdcomp in PPP config - can't combine compression
protocols successfully yet.
* Sat Jan 06 2001 Charlie Brady <charlieb@e-smith.com>
- [1.1.0-17]
- Only run %postun script if in runlevel 7
* Sat Jan 06 2001 Charlie Brady <charlieb@e-smith.com>
- [1.1.0-16]
- Adjust pptpd configuration to force mppe
- Add chap secrets fragment to look up passwords in smbpasswd file
* Mon Dec 18 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-15]
- Allow packets to traverse PPTPD interfaces :-)
* Thu Dec 14 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-14]
- Added pptpd-restart action, and called this and pptpd-conf in ip-change event
* Wed Dec 13 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-13]
- Guard dhcpd.conf fragment in case pptpd is disabled
* Wed Dec 13 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-12]
- use emsith::db in pptpd-conf
* Wed Dec 13 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-11]
- Added pptpd-conf into remoteaccess-update
- [1.1.0-10]
- Added pptpd-conf-startup to initialise services entry
- Renamed conf-pptpd -> pptpd-conf
* Wed Dec 13 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-9]
- Made output format consistent other fragments
* Wed Dec 13 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-8]
- Removed closing semi-colon and comment from dhcpd output
* Wed Dec 13 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-7]
- Changed to use single option "sessions" instead of ipstart/ipend
- Steal addresses from dhcpd range
* Tue Dec 12 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-6]
- Added GRE/PPTP packet filter fragment
- Used range specification for remoteip list
* Tue Dec 12 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-5]
- Fixed generation of remoteip list
* Tue Dec 12 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-4]
- Run at run level 7
- Revised generation of remoteip list - range format is strange...
* Tue Dec 12 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-3]
- Removed comments from output files
- Fixed remoteip generation
- Removed speed.orig file
* Tue Dec 12 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-2]
- Fixed inittab fragment
* Tue Dec 12 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-1]
- Rolled version and tarball, including patches to 0.1-4
* Tue Dec 12 2000 Charlie Brady <charlieb@e-smith.com>
- Remove .orig file
- Add service configuration database data for pptpd.
- Add configuration event to post-restore.
* Mon Nov 13 2000 Charlie Brady <charlieb@e-smith.com>
- Strip comments from /etc/pptpd.conf file - they are still in
the templates
- Remove %postun section
* Mon Nov 13 2000 Charlie Brady <charlieb@e-smith.com>
- Change "name" to $SystemName rather than Samba Workgroup
- Add domain setting.
* Mon Nov 13 2000 Charlie Brady <charlieb@e-smith.com>
- Be more verbose in pptpd.conf templates
* Mon Nov 13 2000 Charlie Brady <charlieb@e-smith.com>
- initial
%prep
%setup
%build
for i in console-save \
post-install \
post-upgrade \
bootstrap-console-save \
ip-up.pptpd \
ip-down \
ip-change \
workgroup-update \
remoteaccess-update \
password-modify \
user-create \
user-modify \
user-delete
do
mkdir -p root/etc/e-smith/events/$i
done
perl createlinks
%install
rm -rf $RPM_BUILD_ROOT
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
rm -f %{name}-%{version}-%{release}-filelist
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
> %{name}-%{version}-%{release}-filelist
echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist
%postun
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}-%{version}-%{release}-filelist
%defattr(-,root,root)

1
contriborbase Normal file
View File

@ -0,0 +1 @@
sme10

69
createlinks Normal file
View File

@ -0,0 +1,69 @@
#!/usr/bin/perl -w
use esmith::Build::CreateLinks qw(:all);
#--------------------------------------------------
# general pptpd configuration
#--------------------------------------------------
foreach (qw(dhcpd.conf pptpd.conf ppp/options.pptpd))
{
templates2events("/etc/$_", qw(
console-save
bootstrap-console-save
workgroup-update
remoteaccess-update
ip-change
password-modify
user-create
user-modify
user-modify-admin
user-delete
e-smith-pptpd-update
));
}
foreach (qw(ppp/ip-up.local ppp/ip-down.local))
{
templates2events("/etc/$_", qw(
workgroup-update
remoteaccess-update
ip-change
password-modify
user-create
user-modify
user-modify-admin
user-delete
e-smith-pptpd-update
));
}
foreach $event ( qw(
console-save
remoteaccess-update
ip-change
) )
{
safe_symlink("sigterm", "root/etc/e-smith/events/$event/services2adjust/pptpd");
}
# allowing and denying network access
foreach $event (qw(ip-up.pptpd ip-down))
{
event_link("pptp-interface-access", $event, "70");
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/masq");
}
event_link("clear-pptp-interfaces", "local", "50");
templates2events("/etc/rc.d/init.d/masq", qw(ip-up.pptpd ip-down));
#--------------------------------------------------
# actions for e-smith-pptpd-update event:
#--------------------------------------------------
$event = "e-smith-pptpd-update";
# systemd-specific action mandatory for this package-update event
event_link("systemd-reload", $event, "89");
event_link("systemd-default", $event, "88");
safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/pptpd");
safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/masq");

646
e-smith-pptpd.spec Normal file
View File

@ -0,0 +1,646 @@
# $Id: e-smith-pptpd.spec,v 1.4 2020/12/11 17:19:48 jpp Exp $
Summary: e-smith server and gateway - configure PPTP inbound VPN
%define name e-smith-pptpd
Name: %{name}
%define version 2.6.0
%define release 2
Version: %{version}
Release: %{release}%{?dist}
License: GPL
Group: Networking/Daemons
Source: %{name}-%{version}.tar.xz
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
Requires: e-smith-base >= 4.13.16-27
Requires: pptpd
Obsoletes: kmod-ppp
Obsoletes: kmod-ppp-smp
Obsoletes: kmod-ppp-xenU
Obsoletes: kernel-module-ppp
Obsoletes: kernel-smp-module-ppp
Requires: e-smith-lib >= 1.15.1-16
Requires: e-smith-packetfilter >= 1.13.0-22
Requires: e-smith-radiusd
BuildRequires: e-smith-devtools >= 1.13.1-03
BuildArchitectures: noarch
%description
e-smith server and gateway - configure inbound PPTP VPN access
%changelog
* Wed Jul 12 2023 cvs2git.sh aka Brian Read <brianr@koozali.org> 2.6.0-2.sme
- Roll up patches and move to git repo [SME: 12338]
* Wed Jul 12 2023 BogusDateBot
- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
by assuming the date is correct and changing the weekday.
* Fri Dec 11 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-2.sme
- create -update event [SME: 11149]
- adapt to systemd [SME: 11112]
- remove pptpd support [SME: 11249]
* Fri Feb 05 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-1.sme
- Initial release to sme10
* Tue Feb 19 2013 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-2.sme
- Use extrapositioned negation in iptables rules [SME: 7262]
* Wed Feb 13 2013 Shad L. Lords <slords@mail.com> 2.4.0-1.sme
- Roll new stream for sme9
* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
- Roll new stream to separate sme7/sme8 trees [SME: 4633]
* Sat Aug 09 2008 Gavin Weight <gweight@gmail.com> 1.12.0-13
- Remove the Requires kernel =>2.4 line. [SME: 4483]
* Wed May 21 2008 Shad L. Lords <slords@mail.com> 1.12.0-12
- Move mtu/mru settings to database [SME: 549]
* Sat Jan 12 2008 Shad L. Lords <slords@mail.com> 1.12.0-11
- pptp connections setting mtu/mru > 1400 [SME: 549]
* Sun Jun 03 2007 Gavin Weight <gweight@gmail.com> 1.12.0-10
- Increase lcp-echo-failure from 4 to 10. [SME: 3001]
* Wed May 9 2007 Shad L. Lords <slords@mail.com> 1.12.0-9
- Updates to support SME Server 8
* Sun Apr 29 2007 Shad L. Lords <slords@mail.com>
- Clean up spec so package can be built by koji/plague
* Fri Apr 06 2007 Shad L. Lords <slords@mail.com> 1.12.0-8
- Remove dhcpd metadata file. Should be in e-smith-base [SME: 2715]
* Fri Apr 06 2007 Shad L. Lords <slords@mail.com> 1.12.0-7
- Fix perms on pptpd.conf and options file [SME: 2717]
* Sun Jan 14 2007 Shad L. Lords <slords@mail.com> 1.12.0-6
- Fix interface-access script to remove warnings [SME: 2244]
* Thu Dec 07 2006 Shad L. Lords <slords@mail.com>
- Update to new release naming. No functional changes.
- Make Packager generic
* Sat Dec 02 2006 Shad L. Lords <slords@mail.com> 1.12.0-04
- Update requires to reflect new kernel module format
* Sun Apr 9 2006 Charlie Brady <charlie_brady@mitel.com> 1.12.0-03
- Make pptpd debug logging depend on $pptpd{debug}. [SME: 1224]
* Tue Mar 21 2006 Charlie Brady <charlie_brady@mitel.com> 1.12.0-02
- Purge Interfaces property of pptpd record on bootup. [SME: 1073]
- Remove multilink setting from pppd configuration used by pptpd. Add
LCP timeout processing to autodisconnect stale links. [SME: 1064]
- Control "passive" setting by db property - enabled by default. [SME: 1064]
* Wed Mar 15 2006 Charlie Brady <charlie_brady@mitel.com> 1.12.0-01
- Roll stable stream version. [SME: 1016]
* Wed Mar 1 2006 Gordon Rowell <gordonr@gormand.com.au> 1.11.0-22
- Add 'passive' option to /etc/ppp/options.pptpd [SME: 160]
* Wed Feb 15 2006 Charlie Brady <charlie_brady@mitel.com> 1.11.0-21
- Dynamically calculate remote IP address range - dhcpd.conf won't
necessarily be expanded before pptpd.conf, so we can't depend on
a side effect. [SME: 797]
* Sun Feb 12 2006 Charlie Brady <charlieb@e-smith.com> 1.11.0-20
- Resolve some duplication of files included in e-smith-base.
[SME: 752]
* Wed Nov 30 2005 Gordon Rowell <gordonr@gormand.com.au> 1.11.0-19
- Bump release number only
* Tue Aug 16 2005 Charlie Brady <charlieb@e-smith.com>
- [1.11.0-18]
- Add Requires headers for kernel module RPMs, to ensure that module RPMs are
added during install/upgrade.
* Wed Jul 27 2005 Shad L. Lords <slords@mail.com>
- [1.11.0-17]
- Add noipparam parameter so that ppp gets called correctly [SF: 1228376]
- Move masq fragment from template to db [SF: 1241414]
- Default sessions to 0 like web panel
* Tue Jul 12 2005 Charlie Brady <charlieb@e-smith.com>
- [1.11.0-16]
- Patch from Shad. Remove modprobe of ppp_generic (unnecessary). [SF: 1225995]
* Fri Jun 24 2005 Charlie Brady <charlieb@e-smith.com>
- [1.11.0-15]
- Various options.pptpd config changes to support radius auth. [SF: 1225995]
- Ensure that ppp_generic module is loaded before running pptpd. [SF: 1225995]
* Thu Jun 16 2005 Charlie Brady <charlieb@e-smith.com>
- [1.11.0-14]
- Add rc7.d startup symlink for pptpd. [SF: 1215401]
- Add Requires: e-smith-radiusd [SF: 1215401]
* Thu Jun 16 2005 Charlie Brady <charlieb@e-smith.com>
- [1.11.0-13]
- Add missing radius plugin template fragment. [SF: 1215401]
* Mon Jun 13 2005 Charlie Brady <charlieb@e-smith.com>
- [1.11.0-12]
- Use radius plugin to access NT hash passwords and obsolete
domain strip option. [SF: 1215401]
* Tue Mar 15 2005 Charlie Brady <charlieb@e-smith.com>
- [1.11.0-11]
- Fix path problem in adjust-services action symlinks. [MN00065576]
- Remove explicit links to implicit actions.
* Tue Jan 25 2005 Charlie Brady <charlieb@e-smith.com>
- [1.11.0-10]
- Fix more breakage in use of generic_template_expand action. [MN00064130]
* Tue Jan 25 2005 Charlie Brady <charlieb@e-smith.com>
- [1.11.0-09]
- Obsolete pptpd-restart by use of generic adjust-services action.
[MN00065576]
* Thu Jan 20 2005 Charlie Brady <charlieb@e-smith.com>
- [1.11.0-08]
- Fix some breakage in use of generic_template_expand action. [MN00064130]
* Wed Jan 19 2005 Charlie Brady <charlieb@e-smith.com>
- [1.11.0-07]
- Use generic_template_expand action in place of pptpd-conf.
[MN00064130]
* Fri Sep 3 2004 Charlie Brady <charlieb@e-smith.com>
- [1.11.0-06]
- Clean BuildRequires. [charlieb MN00043055]
* Mon Jan 19 2004 Michael Soulier <msoulier@e-smith.com>
- [1.11.0-05]
- Made pptpd-restart pptpd status aware. [msoulier 4502]
* Mon Jan 19 2004 Michael Soulier <msoulier@e-smith.com>
- [1.11.0-04]
- Updated pptpd-restart. [msoulier 4502]
* Mon Jan 19 2004 Michael Soulier <msoulier@e-smith.com>
- [1.11.0-03]
- Removing old inittab fragment. [msoulier 4502]
* Mon Jan 19 2004 Michael Soulier <msoulier@e-smith.com>
- [1.11.0-02]
- Adding supervision of pptpd. [msoulier 4502]
* Mon Jan 19 2004 Michael Soulier <msoulier@e-smith.com>
- [1.11.0-01]
- rolling to dev - 1.11.0
* Wed Jul 9 2003 Charlie Brady <charlieb@e-smith.com>
- [1.10.0-02]
- Denylog inbound GRE unless pptpd is enabled. This allows
masquerade to work better. [charlieb 9249]
* Thu Jun 26 2003 Charlie Brady <charlieb@e-smith.com>
- [1.10.0-01]
- Changing version to stable stream number - 1.10.0
* Wed Jun 18 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-24]
- Enable ppp multilink, to help Win XP PPTP reliability [charlieb 9059]
* Wed Jun 18 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-23]
- Back out last change; it's required for address pool sharing. [charlieb 8874]
* Wed Jun 11 2003 Gordon Rowell <gordonr@e-smith.com>
- [1.9.0-22]
- Don't expand /etc/dhcpd.conf here - let the run script do it [gordonr 8883]
* Tue Jun 10 2003 Tony Clayton <apc@e-smith.com>
- [1.9.0-21]
- Fix pptpd.conf/remoteip fragment to use new StartIP property [tonyc 8883]
* Fri Jun 6 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-20]
- Fix runtime errors in last change, and add comment. [charlieb 8951]
* Fri Jun 6 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-19]
- Use esmith::ConfigDB::wins_server method to determine correct
wins server. [charlieb 8951]
* Tue Jun 3 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-18]
- Fix arithmetic in last change. [charlieb 8883]
* Tue Jun 3 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-17]
- Add comment to dhcpd.conf to show which addresses have been
"borrowed". Remove template fragment which generates static IP definitions
for pptpd "hostnames" (these aren't useful). [charlieb 8883]
* Tue Jun 3 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-16]
- Convert pptpd-conf script to use esmith::ConfigDB and remove use of
deprecated CONFREF.
- Expand dhcpd.conf in pptpd-conf script, to ensure that address range
is configured. [charlieb 8883]
* Tue Jun 3 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-15]
- Improve explicit subtraction of pptpd addresses from DHCP range. [charlieb 8883]
* Wed May 28 2003 Gordon Rowell <gordonr@e-smith.com>
- [1.9.0-14]
- Relocate chap-secrets fragment to e-smith-base [gordonr 8747]
* Wed May 28 2003 Gordon Rowell <gordonr@e-smith.com>
- [1.9.0-13]
- Relocate /etc/smbpasswd to /etc/samba/smbpasswd [gordonr 8747]
* Wed May 28 2003 Gordon Rowell <gordonr@e-smith.com>
- [1.9.0-12]
- Removed processing of /etc/ppp/chap-secrets, now done in ppp-conf-users [gordonr 8849]
- Removed creation of pptpd record - defaults fragments exist [gordonr 8849]
* Fri May 23 2003 Gordon Rowell <gordonr@e-smith.com>
- [1.9.0-11]
- Fixed createlinks [gordonr 4847]
* Fri May 23 2003 Gordon Rowell <gordonr@e-smith.com>
- [1.9.0-10]
- Reconfigure pptp in user-modify-admin [gordonr 4847]
* Fri May 23 2003 Gordon Rowell <gordonr@e-smith.com>
- [1.9.0-09]
- Rewrote chap-secrets fragment with new DB interface [gordonr 4847]
- Use VPNClientAccess instead of PPTPAccess [gordonr 4847]
* Tue May 13 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-08]
- Skip users unless PPTPAccess property of user is "yes". We don't want the
no/disabled ambiguity. [charlieb 4847]
* Tue May 6 2003 Mark Knox <markk@e-smith.com>
- [1.9.0-07]
- Call pptpd-conf in user-modify as well as create & delete [markk 4847]
- Skip users with PPTPAccess of 'off' or 'disabled' [markk 4847]
* Thu May 1 2003 Michael Soulier <msoulier@e-smith.com>
- [1.9.0-06]
- Added conf-masq and adjust-masq to ip-up.pptpd and ip-down events.
[msoulier 7695]
* Thu May 1 2003 Michael Soulier <msoulier@e-smith.com>
- [1.9.0-05]
- Fixed lack of /etc/ppp/ip-down.local file. [msoulier 7695]
- Removed iptables code from pptp-interface-access. It now sets an Interfaces
parameter in the pptpd record. [msoulier 7695]
- Updated requirements. [msoulier 7695]
* Tue Mar 18 2003 Lijie Deng <lijied@e-smith.com>
- [1.9.0-04]
- Deleted ./etc/pptpd.conf/template-begin [lijied 3295]
* Tue Mar 11 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-03]
- Don't create links to obsoleted pptpd-conf-startup in createlinks.
[charlieb 7526]
* Fri Mar 7 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-02]
- Gracefully handle undefined "sessions" property in hosts.allow fragment
[charlieb 5650]
- Move some db initiatisation into defaults directory fragments.
[charlieb 7526]
* Fri Mar 7 2003 Charlie Brady <charlieb@e-smith.com>
- [1.9.0-01]
- Roll to development stream to 1.9.0
* Fri Oct 11 2002 Charlie Brady <charlieb@e-smith.com>
- [1.8.0-01]
- Roll to maintained version number to 1.8.0
* Thu Oct 3 2002 Charlie Brady <charlieb@e-smith.com>
- [1.7.0-06]
- Fix buglet in debug template fragment. [charlieb 4278]
* Thu Oct 3 2002 Charlie Brady <charlieb@e-smith.com>
- [1.7.0-05]
- Add hosts.allow template fragment (for new wrappers enabled pptpd)
[charlieb 4278]
- Update /etc/ppp/options.pptpd template to match options available
with CVS version of pppd. Add property driven debug fragment
while we are at it [charlieb 4278]
* Wed Oct 2 2002 Charlie Brady <charlieb@e-smith.com>
- [1.7.0-04]
- Remove listen directive - all interfaces is the default, and new
pptpd segfaults on "listen 0.0.0.0". [charlieb 4797]
* Tue Sep 17 2002 Gordon Rowell <gordonr@e-smith.com>
- [1.7.0-03]
- Force re-tag of file from 1.7.0-02 [gordonr 4797]
* Mon Sep 16 2002 Gordon Rowell <gordonr@e-smith.com>
- [1.7.0-02]
- Listen on all interfaces to avoid race condition with external
interface configuration [gordonr 4797]
* Mon Sep 16 2002 Gordon Rowell <gordonr@e-smith.com>
- [1.7.0-01]
- Forced version update by co2rpm to 1.7.0
- Bumped version number - this is a development stream [gordonr 4501]
* Thu Sep 12 2002 Charlie Brady <charlieb@e-smith.com>
- [1.6.6-04]
- Fix destination address verification rules of gre-in rules. [charlieb 4501]
* Wed Sep 11 2002 Charlie Brady <charlieb@e-smith.com>
- [1.6.6-03]
- Add nomppe-40 option to prevent use of 40 bit encryption [charlieb 4278]
* Wed Sep 11 2002 Charlie Brady <charlieb@e-smith.com>
- [1.6.6-02]
- Roll back all PPP options changes so that we can use orig pppd binary.
[charlieb 4278]
* Wed Aug 28 2002 Charlie Brady <charlieb@e-smith.com>
- [1.6.6-01]
- Add action script to enable/disable unrestricted traffic on
an interface when PPTP comes up/goes down. [charlieb 4501]
* Wed Aug 28 2002 Charlie Brady <charlieb@e-smith.com>
- [1.6.5-01]
- Change allow_tcp_in calling sequence, to facilitate non-disruptive
change. [charlieb 4501]
- Add GRE rules which are run-time switchable [charlieb 4501]
* Thu Aug 8 2002 Charlie Brady <charlieb@e-smith.com>
- [1.5.5-01]
- Use allow_tcp_in() function in masq template fragment. [charlieb 4499]
* Wed Jul 31 2002 Charlie Brady <charlieb@e-smith.com>
- [1.5.4-01]
- Fix a few errors in the pptp PPP configuration. [charlieb 4278]
* Thu Jul 25 2002 Charlie Brady <charlieb@e-smith.com>
- [1.5.3-01]
- Use mschap and mppe configuration directives compatible with the latest
pppd (from CVS). [charlieb 4278]
* Tue Jul 23 2002 Charlie Brady <charlieb@e-smith.com>
- [1.5.2-01]
- Fix iptables usage - on OUTPUT chain, now use -o interface_name, not
-i interface_name. [charlieb 1268]
* Wed Jul 17 2002 Charlie Brady <charlieb@e-smith.com>
- [1.5.1-01]
- Change masq script fragment to use iptables. [charlieb 1268]
* Wed Jun 5 2002 Charlie Brady <charlieb@e-smith.com>
- [1.5.0-01]
- Changing version to development stream number - 1.5.0
* Mon May 27 2002 Charlie Brady <charlieb@e-smith.com>
- [1.4.5-01]
- Include pptpd-conf action in workgroup-update event, so that WINS setting is
added/deleted if required. [charlieb 3602]
* Thu May 23 2002 Gordon Rowell <gordonr@e-smith.com>
- [1.4.4-01]
- RPM rebuild forced by cvsroot2rpm
* Wed May 22 2002 Charlie Brady <charlieb@e-smith.com>
- [1.4.3-01]
- Grab samba domain master setting from smb service, not from SambaDomainMaster.
[charlieb 3160]
* Sat May 18 2002 Charlie Brady <charlieb@e-smith.com>
- [1.4.2-01]
- Add missing bootstrap-console-save event directory.
* Sat May 18 2002 Charlie Brady <charlieb@e-smith.com>
- [1.4.1-01]
- Test build to verify CVS conversion.
* Tue Dec 11 2001 Charlie Brady <charlieb@e-smith.com>
- [1.4.0-01]
- rollRPM: Rolled version number to 1.4.0-01. Includes patches up to 1.3.0-02.
* Tue Dec 11 2001 Charlie Brady <charlieb@e-smith.com>
- [1.3.0-02]
- Fix pptpd-restart so that it won't log FAILED when it tries to shut down
a pptpd which is not running.
* Mon Nov 12 2001 Charlie Brady <charlieb@e-smith.com>
- [1.3.0-01]
- Rolled version number to 1.3.0-01. Includes patches upto 1.2.0-09.
* Thu Oct 25 2001 Charlie Brady <charlieb@e-smith.com>
- [1.2.0-09]
- Add conf action to bootstrap-console-save event
* Fri Aug 17 2001 gordonr
- [1.2.0-08]
- Autorebuild by rebuildRPM
* Mon Jul 30 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.2.0-07]
- Don't check for /var/lock/subsys/pptpd - pptp is managed by init
and this lock file will not always be created
* Fri Jul 6 2001 Peter Samuel <peters@e-smith.com>
- [1.2.0-06]
- Including GPL license with package
* Sat Apr 28 2001 Charlie Brady <charlieb@e-smith.com>
- [1.2.0-05]
- Only advertise WINS address if configured as Samba Domain Master.
* Tue Apr 24 2001 Charlie Brady <charlieb@e-smith.com>
- [1.2.0-04]
- Fix problem in dhcpd.conf template with non C class addresses.
* Thu Feb 8 2001 Adrian Chung <adrianc@e-smith.com>
- [1.2.0-03]
- Rolling release number for GPG signing.
* Thu Jan 25 2001 Charlie Brady <charlieb@e-smith.com>
- [1.2.0-02]
- Add "ipparam pptpd" to ppp options file.
- Remove obsolete post-restore event.
- Removed %postun script.
* Thu Jan 25 2001 Peter Samuel <peters@e-smith.com>
- [1.2.0-01]
- Rolled version number to 1.2.0-01. Includes patches upto 1.1.0-29.
* Thu Jan 18 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-29]
- Allow admin to use PPTP
* Fri Jan 12 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-28]
- Users now have a property of PPTPAccess - defaults to allowed
Set to "off" to disable individual user access to PPTP
* Fri Jan 12 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-27]
- Backed out serviceControl() - it doesn't handle non-initscript startup yet
* Thu Jan 11 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-26]
- Fix call to serviceControl()
* Thu Jan 11 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-25]
- Use serviceControl()
* Thu Jan 11 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-24]
- Check pptpd status is defined in masq template
* Thu Jan 11 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-23]
- Set listenip to $LocalIP in serveronly mode - thanks Karl Ponsonby
* Thu Jan 11 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-22]
- Explictly list users in chap-secrets, but only if their password is set
* Thu Jan 11 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-21]
- Added /etc/ppp/ip-up.local
* Thu Jan 11 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-20]
- /etc/ppp/chap-secrets is required for pptp
* Thu Jan 11 2001 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-19]
- Fixed remoteip calculation - missing pptpd/sessions
* Sun Jan 07 2001 Charlie Brady <charlieb@e-smith.com>
- [1.1.0-18]
- Fix remote address calculation in /etc/pptpd.conf
- Disable deflate and bsdcomp in PPP config - can't combine compression
protocols successfully yet.
* Sat Jan 06 2001 Charlie Brady <charlieb@e-smith.com>
- [1.1.0-17]
- Only run %postun script if in runlevel 7
* Sat Jan 06 2001 Charlie Brady <charlieb@e-smith.com>
- [1.1.0-16]
- Adjust pptpd configuration to force mppe
- Add chap secrets fragment to look up passwords in smbpasswd file
* Mon Dec 18 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-15]
- Allow packets to traverse PPTPD interfaces :-)
* Thu Dec 14 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-14]
- Added pptpd-restart action, and called this and pptpd-conf in ip-change event
* Wed Dec 13 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-13]
- Guard dhcpd.conf fragment in case pptpd is disabled
* Wed Dec 13 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-12]
- use emsith::db in pptpd-conf
* Wed Dec 13 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-11]
- Added pptpd-conf into remoteaccess-update
- [1.1.0-10]
- Added pptpd-conf-startup to initialise services entry
- Renamed conf-pptpd -> pptpd-conf
* Wed Dec 13 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-9]
- Made output format consistent other fragments
* Wed Dec 13 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-8]
- Removed closing semi-colon and comment from dhcpd output
* Wed Dec 13 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-7]
- Changed to use single option "sessions" instead of ipstart/ipend
- Steal addresses from dhcpd range
* Tue Dec 12 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-6]
- Added GRE/PPTP packet filter fragment
- Used range specification for remoteip list
* Tue Dec 12 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-5]
- Fixed generation of remoteip list
* Tue Dec 12 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-4]
- Run at run level 7
- Revised generation of remoteip list - range format is strange...
* Tue Dec 12 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-3]
- Removed comments from output files
- Fixed remoteip generation
- Removed speed.orig file
* Tue Dec 12 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-2]
- Fixed inittab fragment
* Tue Dec 12 2000 Gordon Rowell <gordonr@e-smith.com>
- [1.1.0-1]
- Rolled version and tarball, including patches to 0.1-4
* Tue Dec 12 2000 Charlie Brady <charlieb@e-smith.com>
- Remove .orig file
- Add service configuration database data for pptpd.
- Add configuration event to post-restore.
* Mon Nov 13 2000 Charlie Brady <charlieb@e-smith.com>
- Strip comments from /etc/pptpd.conf file - they are still in
the templates
- Remove %postun section
* Mon Nov 13 2000 Charlie Brady <charlieb@e-smith.com>
- Change "name" to $SystemName rather than Samba Workgroup
- Add domain setting.
* Mon Nov 13 2000 Charlie Brady <charlieb@e-smith.com>
- Be more verbose in pptpd.conf templates
* Mon Nov 13 2000 Charlie Brady <charlieb@e-smith.com>
- initial
%prep
%setup
rm -rf root/service root/var/service root/etc/rc.d
%build
perl createlinks
%install
rm -rf $RPM_BUILD_ROOT
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
rm -f %{name}-%{version}-%{release}-filelist
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
--file /var/service/pptpd/log/run 'attr(0755,root,root)' \
--dir /var/log/pptpd 'attr(2750,smelog,smelog)' \
> %{name}-%{version}-%{release}-filelist
echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}-%{version}-%{release}-filelist
%defattr(-,root,root)

1
root/etc/e-smith/db/configuration/defaults/pptpd/TCPPort Normal file
View File

@ -0,0 +1 @@
1723

1
root/etc/e-smith/db/configuration/defaults/pptpd/access Normal file
View File

@ -0,0 +1 @@
public

1
root/etc/e-smith/db/configuration/defaults/pptpd/sessions Normal file
View File

@ -0,0 +1 @@
0

1
root/etc/e-smith/db/configuration/defaults/pptpd/status Normal file
View File

@ -0,0 +1 @@
disabled

1
root/etc/e-smith/db/configuration/defaults/pptpd/type Normal file
View File

@ -0,0 +1 @@
service

4
root/etc/e-smith/db/configuration/migrate/10NoPPTPStartIP Normal file
View File

@ -0,0 +1,4 @@
{
# We don't need $pptpd{StartIP} any more
$DB->get_prop_and_delete('pptpd', 'StartIP');
}

3
root/etc/e-smith/events/actions/clear-pptp-interfaces Normal file
View File

@ -0,0 +1,3 @@
#! /bin/sh
exec /sbin/e-smith/config delprop pptpd Interfaces

63
root/etc/e-smith/events/actions/pptp-interface-access Executable file
View File

@ -0,0 +1,63 @@
#!/usr/bin/perl -w
#----------------------------------------------------------------------
# copyright (C) 2002 Mitel Networks Corporaton.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Technical support for this program is available from e-smith, inc.
# For details, please visit our web site at www.e-smith.com or
# call us on 1 888 ESMITH 1 (US/Canada toll free) or +1 613 564 8000
#----------------------------------------------------------------------
package esmith;
use strict;
use Errno;
use esmith::util;
use esmith::ConfigDB;
use constant SIGEVENT => '/sbin/e-smith/signal-event';
my $db = esmith::ConfigDB->open;
my $pptpd = $db->get('pptpd');
my %ifaces = map { $_ => 1 } split /,/, $pptpd->prop('Interfaces') || '';
my $event = $ARGV[0] || die "Event name must be given\n";
my $ipparam = $ARGV[6] || "(none)";
exit 0 unless ($ipparam eq "pptpd");
my $interface = $ARGV[1] || die "Couldn't determine interface name\n";
if ($event eq "ip-down")
{
# Remove this interface.
if (exists $ifaces{$interface})
{
delete $ifaces{$interface};
}
}
elsif ($event eq "ip-up.pptpd")
{
# Add this interface.
$ifaces{$interface} = 1;
}
else
{
die "Don't know what to do for event $event\n";
}
$pptpd->set_prop('Interfaces', join ',', keys %ifaces);
exit(0);

0
root/etc/e-smith/events/bootstrap-console-save/.gitignore vendored Normal file
View File

0
root/etc/e-smith/events/console-save/.gitignore vendored Normal file
View File

0
root/etc/e-smith/events/ip-change/.gitignore vendored Normal file
View File

0
root/etc/e-smith/events/ip-down/.gitignore vendored Normal file
View File

0
root/etc/e-smith/events/ip-up.pptpd/.gitignore vendored Normal file
View File

0
root/etc/e-smith/events/password-modify/.gitignore vendored Normal file
View File

0
root/etc/e-smith/events/post-install/.gitignore vendored Normal file
View File

0
root/etc/e-smith/events/post-upgrade/.gitignore vendored Normal file
View File

0
root/etc/e-smith/events/remoteaccess-update/.gitignore vendored Normal file
View File

0
root/etc/e-smith/events/user-create/.gitignore vendored Normal file
View File

0
root/etc/e-smith/events/user-delete/.gitignore vendored Normal file
View File

0
root/etc/e-smith/events/user-modify/.gitignore vendored Normal file
View File

0
root/etc/e-smith/events/workgroup-update/.gitignore vendored Normal file
View File

3
root/etc/e-smith/templates.metadata/etc/ppp/options.pptpd Normal file
View File

@ -0,0 +1,3 @@
PERMS=0644
UID="root"
GID="root"

3
root/etc/e-smith/templates.metadata/etc/pptpd.conf Normal file
View File

@ -0,0 +1,3 @@
PERMS=0644
UID="root"
GID="root"

21
root/etc/e-smith/templates/etc/dhcpd.conf/04TakePPTPDAddresses Normal file
View File

@ -0,0 +1,21 @@
{
my $pptpd_status = $pptpd{status} || 'disabled';
my $pptpd_sessions = $pptpd{sessions} || 0;
# Do nothing unless we have to
return "" unless ($pptpd_status eq 'enabled' && $pptpd_sessions);
# Calculate pptpd start and end addresses
$pptpd_end_addr = esmith::util::IPquadToAddr($endDynamicIPRange);
$pptpd_start_addr = $pptpd_end_addr - $pptpd_sessions + 1;
# and correct the DHCP dynamic address range
$endDynamicIPRange = esmith::util::IPaddrToQuad($pptpd_end_addr - $pptpd_sessions);
return "# Addresses from " .
esmith::util::IPaddrToQuad($pptpd_start_addr) .
" to " .
esmith::util::IPaddrToQuad($pptpd_start_addr + $pptpd_sessions - 1) .
" taken for PPTP sessions";
}

6
root/etc/e-smith/templates/etc/hosts.allow/pptpd Normal file
View File

@ -0,0 +1,6 @@
{
my $status = $pptpd{status} || 'disabled';
$sessions = $pptpd{sessions} || 0;
$status = 'disabled' unless $sessions > 0;
$OUT = $status eq 'enabled' ? "pptpd: ALL" : "# pptpd is disabled";
}

3
root/etc/e-smith/templates/etc/ppp/ip-up.local/30ipparam20pptpd Normal file
View File

@ -0,0 +1,3 @@
pptpd)
/sbin/e-smith/signal-event ip-up.pptpd "$@"
;;

1
root/etc/e-smith/templates/etc/ppp/options.pptpd/auth Normal file
View File

@ -0,0 +1 @@
auth

4
root/etc/e-smith/templates/etc/ppp/options.pptpd/debug Normal file
View File

@ -0,0 +1,4 @@
{
my $debug = $pptpd{debug} || 'no';
$OUT = $debug eq 'yes' ? "debug" : "# debug is not enabled";
}

1
root/etc/e-smith/templates/etc/ppp/options.pptpd/domain Normal file
View File

@ -0,0 +1 @@
domain { "$DomainName" }

2
root/etc/e-smith/templates/etc/ppp/options.pptpd/ipparam Normal file
View File

@ -0,0 +1,2 @@
# Tell ip-up and ip-down who is running them
ipparam pptpd

2
root/etc/e-smith/templates/etc/ppp/options.pptpd/lcp-echo-options Normal file
View File

@ -0,0 +1,2 @@
lcp-echo-interval 15
lcp-echo-failure 10

1
root/etc/e-smith/templates/etc/ppp/options.pptpd/lock Normal file
View File

@ -0,0 +1 @@
lock

5
root/etc/e-smith/templates/etc/ppp/options.pptpd/mppe Normal file
View File

@ -0,0 +1,5 @@
nodeflate
nobsdcomp
require-mppe-128
nomppe-40
nomppe-stateful # refuse stateful mode, i.e. use stateless

1
root/etc/e-smith/templates/etc/ppp/options.pptpd/mru Normal file
View File

@ -0,0 +1 @@
{ $pptpd{mru} ? "mru $pptpd{mru}" : "# mru not set" }

1
root/etc/e-smith/templates/etc/ppp/options.pptpd/ms-dns Normal file
View File

@ -0,0 +1 @@
ms-dns { "$LocalIP" }

8
root/etc/e-smith/templates/etc/ppp/options.pptpd/ms-wins Normal file
View File

@ -0,0 +1,8 @@
{
# Grab our local WINS server setting, unless another fragment
# has already set it
$_WINSServer ||= $DB->wins_server;
$OUT .= defined $_WINSServer ?
"ms-wins $_WINSServer" :
"# Network has no WINS server set";
}

1
root/etc/e-smith/templates/etc/ppp/options.pptpd/mtu Normal file
View File

@ -0,0 +1 @@
{ $pptpd{mtu} ? "mtu $pptpd{mtu}" : "# mtu not set" }

1
root/etc/e-smith/templates/etc/ppp/options.pptpd/name Normal file
View File

@ -0,0 +1 @@
name { "$SystemName" }

1
root/etc/e-smith/templates/etc/ppp/options.pptpd/netmask Normal file
View File

@ -0,0 +1 @@
netmask { "$LocalNetmask" }

1
root/etc/e-smith/templates/etc/ppp/options.pptpd/nologfd Normal file
View File

@ -0,0 +1 @@
nologfd

4
root/etc/e-smith/templates/etc/ppp/options.pptpd/passive Normal file
View File

@ -0,0 +1,4 @@
{
my $passive = $pptpd{Passive} || 'enabled';
$OUT = ($passive eq 'enabled') ? "passive" : "# passive mode is disabled in db";
}

1
root/etc/e-smith/templates/etc/ppp/options.pptpd/proxyarp Normal file
View File

@ -0,0 +1 @@
proxyarp

1
root/etc/e-smith/templates/etc/ppp/options.pptpd/radius Normal file
View File

@ -0,0 +1 @@
plugin radius.so

4
root/etc/e-smith/templates/etc/ppp/options.pptpd/require-chap Normal file
View File

@ -0,0 +1,4 @@
refuse-pap
refuse-chap
refuse-mschap
require-mschap-v2 # Need MSCHAP-v2 to initialise encryption key

4
root/etc/e-smith/templates/etc/pptpd.conf/debug Normal file
View File

@ -0,0 +1,4 @@
{
my $debug = $pptpd{debug} || 'no';
$OUT = $debug eq 'yes' ? "debug" : "# debug is not enabled";
}

27
root/etc/e-smith/templates/etc/pptpd.conf/localip Normal file
View File

@ -0,0 +1,27 @@
{
# TAG: localip
#
# Specifies the local and remote IP address ranges.
#
# You can specify single IP addresses seperated by commas or you can
# specify ranges, or both. For example:
#
# 192.168.0.234,192.168.0.245-249,192.168.0.254
#
# IMPORTANT RESTRICTIONS:
#
# 1. No spaces are permitted between commas or within addresses.
#
# 2. If you give more IP addresses than MAX_CONNECTIONS, it will
# start at the beginning of the list and go until it gets
# MAX_CONNECTIONS IPs. Others will be ignored.
#
# 3. No shortcuts in ranges! ie. 234-8 does not mean 234 to 238,
# you must type 234-238 if you mean this.
#
# 4. If you give a single localIP, that's ok - all local IPs will
# be set to the given one. You MUST still give at least one remote
# IP for each simultaneous client.
#
}
localip { $LocalIP }

7
root/etc/e-smith/templates/etc/pptpd.conf/noipparm Normal file
View File

@ -0,0 +1,7 @@
{
# TAG: noipparam
# Suppress the passing of the client's IP address to PPP, which is
# done by default otherwise.
#
}
noipparam

8
root/etc/e-smith/templates/etc/pptpd.conf/option Normal file
View File

@ -0,0 +1,8 @@
{
# TAG: option
#
# Specifies the location of the PPP options file.
# By default PPP looks in '/etc/ppp/options'
#
}
option /etc/ppp/options.pptpd

8
root/etc/e-smith/templates/etc/pptpd.conf/pidfile Normal file
View File

@ -0,0 +1,8 @@
{
# TAG: pidfile
#
# This defines the file name in which pptpd should store its process
# ID (or pid). The default is /var/run/pptpd.pid.
#
}
pidfile /var/run/pptpd.pid

61
root/etc/e-smith/templates/etc/pptpd.conf/remoteip Normal file
View File

@ -0,0 +1,61 @@
{
# TAG: remoteip
#
# Specifies the local and remote IP address ranges.
#
# You can specify single IP addresses seperated by commas or you can
# specify ranges, or both. For example:
#
# 192.168.0.234,192.168.0.245-249,192.168.0.254
#
# IMPORTANT RESTRICTIONS:
#
# 1. No spaces are permitted between commas or within addresses.
#
# 2. If you give more IP addresses than MAX_CONNECTIONS, it will
# start at the beginning of the list and go until it gets
# MAX_CONNECTIONS IPs. Others will be ignored.
#
# 3. No shortcuts in ranges! ie. 234-8 does not mean 234 to 238,
# you must type 234-238 if you mean this.
#
# 4. If you give a single localIP, that's ok - all local IPs will
# be set to the given one. You MUST still give at least one remote
# IP for each simultaneous client.
#
return "# pptpd disabled - no remoteip"
unless ($pptpd{status} eq 'enabled');
# PPTPD can't do ranges in the form 192.168.42.200-192.168.42.210
# (Grrrr!!!) so we need to use the 192.168.42.200-210 format
my $netmaskBits = esmith::util::IPquadToAddr ($LocalNetmask);
my $sessions = $pptpd{sessions} || 0;
# Calculate pptpd start and end addresses
my $endIP = $dhcpd{end};
my $end_addr = esmith::util::IPquadToAddr($endIP);
my $start_addr = $end_addr - $sessions + 1;
my $startIP = esmith::util::IPaddrToQuad($start_addr);
my @start = split(/\./, $startIP);
my @end = split(/\./, $endIP);
$OUT .= "remoteip ";
my $start = shift @start;
my $end = shift @end ;
$OUT .= ($start eq $end) ? "$start." : "$start-$end.";
$start = shift @start;
$end = shift @end ;
$OUT .= ($start eq $end) ? "$start." : "$start-$end.";
$start = shift @start;
$end = shift @end ;
$OUT .= ($start eq $end) ? "$start." : "$start-$end.";
$start = shift @start;
$end = shift @end ;
$OUT .= ($start eq $end) ? "$start" : "$start-$end";
}

8
root/etc/e-smith/templates/etc/pptpd.conf/speed Normal file
View File

@ -0,0 +1,8 @@
{
# TAG: speed
#
# Specifies the speed for the PPP daemon to talk at.
# Some PPP daemons will ignore this value.
#
}
speed 460800

9
root/etc/e-smith/templates/etc/rc.d/init.d/masq/55AllowGRE Normal file
View File

@ -0,0 +1,9 @@
{
# I'm not certain that this is needed. This should be handled by
# connection tracking - we should only accept GRE packets from
# sites we've already negotiated PPTP connections with.
} /sbin/iptables --new-chain gre-in
/sbin/iptables --append INPUT -p 47 -j gre-in
/sbin/iptables --append INPUT -p 47 -j denylog
/sbin/iptables --append gre-in ! -d $OUTERNET -j denylog
/sbin/iptables --append gre-in -j denylog

11
root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust00Start Normal file
View File

@ -0,0 +1,11 @@
{
$OUT = "";
if ((%pptpd) and (exists $pptpd{Interfaces}))
{
$OUT .=<<'EOF';
OLD_PPPconn=$(get_safe_id PPPconn filter find)
NEW_PPPconn=$(get_safe_id PPPconn filter new)
/sbin/iptables --new-chain $NEW_PPPconn
EOF
}
}

14
root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust50adjust_conns Normal file
View File

@ -0,0 +1,14 @@
{
$OUT = "";
if ((%pptpd) and (exists $pptpd{Interfaces}))
{
my @interfaces = split /,/, $pptpd{Interfaces};
foreach my $interface (sort @interfaces)
{
$OUT .=<<"EOF";
/sbin/iptables --insert \$NEW_PPPconn --in-interface $interface -j ACCEPT
/sbin/iptables --insert \$NEW_PPPconn --out-interface $interface -j ACCEPT
EOF
}
}
}

13
root/etc/e-smith/templates/etc/rc.d/init.d/masq/90PPPconnAdjust99Finish Normal file
View File

@ -0,0 +1,13 @@
{
$OUT = "";
if ((%pptpd) and (exists $pptpd{Interfaces}))
{
$OUT .=<<'EOF';
# Destroy the old chain and put in the new one.
/sbin/iptables --replace PPPconn 1 \
--jump $NEW_PPPconn
/sbin/iptables --flush $OLD_PPPconn
/sbin/iptables --delete-chain $OLD_PPPconn
EOF
}
}

9
root/etc/e-smith/templates/etc/rc.d/init.d/masq/90adjustGRE Normal file
View File

@ -0,0 +1,9 @@
{
my $pptpd_status = $pptpd{status} || 'disabled';
my $target = ($pptpd_status eq 'enabled') ? "ACCEPT" : "denylog";
$OUT =
" /sbin/iptables --replace gre-in 1 ! -d \$OUTERNET -j denylog\n" .
" /sbin/iptables --replace gre-in 2 -j $target";
}

5
root/usr/lib/systemd/system/pptpd.service.d/50-koozali.conf Normal file
View File

@ -0,0 +1,5 @@
[Service]
ExecStartPre=/sbin/e-smith/service-status pptpd
[Install]
WantedBy=sme-server.target

0
root/var/log/pptpd/.gitignore vendored Normal file
View File