svn commit: lorikeet r154 - in trunk/pppd: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-01-03 20:34:57 +0000 (Mon, 03 Jan 2005)
New Revision: 154

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=154

Log:
Update some of the details in the report, to reflect the inclusion of
this patch into PPP.

Andrew Bartlett

Modified:
   trunk/pppd/README
   trunk/pppd/final-report.lyx
   trunk/pppd/final-report.pdf


Changeset:
Modified: trunk/pppd/README
===================================================================
--- trunk/pppd/README	2005-01-03 11:47:52 UTC (rev 153)
+++ trunk/pppd/README	2005-01-03 20:34:57 UTC (rev 154)
@@ -16,15 +16,15 @@
 Configuration (pppd config file):
 
 plugin winbind.so
-ntlm_auth-helper "/usr/local/bin/ntlm_auth --helper-protocol=ntlm-server-1"
+ntlm_auth-helper "/usr/bin/ntlm_auth --helper-protocol=ntlm-server-1"
 
 The --required-membership-of option is also available, to implement a
 'dialin users' or 'vpn users' group.
 
 This is a revised version of the patch presented in my paper of VPN
-intergration with Samba - http://hawkerc.net/staff/abartlet/comp3700
+integration with Samba, see final-report.pdf
 
-This version also supports PAP (plaintext) authentication (natrually,
+This version also supports PAP (plaintext) authentication (naturally,
 not for VPNs, but useful in some modem setups)
 
 Andrew Bartlett

Modified: trunk/pppd/final-report.lyx
===================================================================
--- trunk/pppd/final-report.lyx	2005-01-03 11:47:52 UTC (rev 153)
+++ trunk/pppd/final-report.lyx	2005-01-03 20:34:57 UTC (rev 154)
@@ -1245,9 +1245,8 @@
 \layout Standard
 
 In order to properly integrate this software into pppd, patches needed to
- be applied to expose certain interfaces.
- It is hoped that these patches will be accepted by the ppp maintainer.
- The rest of the Winbind module may be maintained separately, if required.
+ be applied to expose certain interfaces, which have now been accepted by
+ the PPP maintainer, into PPP 2.4.3.
 \layout Section
 
 Installation
@@ -1256,8 +1255,8 @@
 Samba
 \layout Standard
 
-Samba 3.0.0 may be installed, by means of the preferred packaging system for
- the target platform, or from source.
+Samba 3.0.3 (the minimum required version) may be installed, by means of the
+ preferred packaging system for the target platform, or from source.
  No special compilation options are required, but a source install will
  usually place its `prefix' in /usr/local/samba, whereas a binary install
  will be per the system's normal preferences.
@@ -1266,52 +1265,13 @@
 PPP
 \layout Standard
 
-PPP 2.4.2b3 is available only by CVS checkout from pserver.samba.org at this
- stage.
- It needs to be downloaded, patched (with the supplied patch), and installed
- into /usr/sbin/pppd:
-\layout LyX-Code
+PPP 2.4.3 is available 
+\begin_inset LatexCommand \htmlurl[from]{http://ppp.samba.org}
 
-wget http://hawkerc.net/staff/abartlet/ppp-ntlm_auth.patch
-\layout LyX-Code
+\end_inset 
 
-cvs -d :pserver:cvs at pserver.samba.org:/cvsroot login
-\layout Standard
-
-Type `cvs' as a password:
-\layout LyX-Code
-
-cvs -z5 -d :pserver:cvs at pserver.samba.org:/cvsroot co ppp
-\layout LyX-Code
-
-cd ppp
-\layout LyX-Code
-
-patch -p0 < ../ppp-ntlm_auth.patch
-\layout LyX-Code
-
-./configure
-\layout LyX-Code
-
-make
-\layout LyX-Code
-
-make install
-\layout Standard
-
-Next compile and install the Winbind plugins:
-\layout LyX-Code
-
-cd pppd/plugins
-\layout LyX-Code
-
-make
-\layout LyX-Code
-
-make install
-\layout Standard
-
-PPP installation is now complete.
+, or soon as RPMs and other packaged software.
+ 
 \layout Subsection
 
 PoPToP
@@ -1330,7 +1290,7 @@
 \layout Standard
 
 The ppp version specified above assumes the use of the correct kernel modules.
- The patch is in the ppp/linux/mppe directory, of the CVS checkout, and
+ The patch is in the ppp/linux/mppe directory, of the source tarball, and
  assumes a locally-compiled kernel.
  It is different to the patch marked `openssl' that has shipped with debian.
  If your kernel sources were in /data/linux-2.4.22 then you would run:
@@ -1571,7 +1531,7 @@
 plugin winbind.so
 \layout LyX-Code
 
-ntlm_auth-location /usr/bin/ntlm_auth
+ntlm_auth-helper /usr/bin/ntlm_auth --helper-protocol=ntlm-server-1
 \layout LyX-Code
 
 \layout Subsection
@@ -2553,7 +2513,7 @@
 \layout Standard
 
 Components of Samba 3.0 were used by (and modified for) this project.
- All these modifications have been included in release of Samba 3.0.0.
+ All these modifications have been included in release of Samba 3.0.3.
 \layout Subsubsection
 
 Winbind

Modified: trunk/pppd/final-report.pdf
===================================================================
(Binary files differ)