head	1.3;
access;
symbols
	old_RELEASE_5_0_0:1.2
	old_RELEASE_4_7_0:1.2
	old_RELEASE_4_6_2:1.1
	old_RELEASE_4_6_1:1.1
	old_RELEASE_4_6_0:1.1
	old_RELEASE_5_0_DP1:1.1;
locks; strict;
comment	@# @;


1.3
date	2003.03.24.13.33.28;	author nectar;	state dead;
branches;
next	1.2;

1.2
date	2002.06.13.21.00.23;	author mharo;	state Exp;
branches;
next	1.1;

1.1
date	2002.02.18.21.35.50;	author des;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Update 1.2.6 -> 1.2.8

PR:		ports/50031
Supersedes:	ports/44498, ports/46189, ports/47134, ports/48071,
		ports/48096, ports/48966
Submitted by:	Randy Philipp <randy@@umbc.edu>
@
text
@--- ./README.PAM.orig	Mon Jan 21 16:25:42 2002
+++ ./README.PAM	Mon Jan 21 16:27:07 2002
@@@@ -19,14 +19,8 @@@@
 
 FreeBSD:
 
-To use PAM with ProFTPD, you must edit /etc/pam.conf and add the
-following lines:
-
-ftp auth    required    pam_unix.so         try_first_pass
-ftp account required    pam_unix.so         try_first_pass
-ftp session required    pam_permit.so
-
-PAM authentication should now work properly.
+To use PAM with ProFTPD, you must set AuthPAMConfig to 'ftpd'.  If you
+installed proftpd from the ports collection, this is already the default.
 
 Linux:
 To use PAM with ProFTPD, you must edit /etc/pam.d/ftp and add the
--- doc/Configuration.html.orig	Wed May 22 10:08:15 2002
+++ doc/Configuration.html	Sat Jun  1 10:30:54 2002
@@@@ -3806,7 +3806,7 @@@@
 ></DT
 ><DD
 ><P
->ftp</P
+>ftpd</P
 ></DD
 ><DT
 ><PRE
--- ./modules/mod_pam.c.orig	Mon Jan 21 16:28:51 2002
+++ ./modules/mod_pam.c	Mon Jan 21 16:29:03 2002
@@@@ -48,7 +48,7 @@@@
 #endif /* HAVE_SECURITY_PAM_APPL_H */
 
 static pam_handle_t *	pamh			= NULL;
-static char *		pamconfig		= "ftp";
+static char *		pamconfig		= "ftpd";
 static char *		pam_user 		= (char *)0;
 static char *		pam_pass 		= (char *)0;
 static int		pam_user_len		= 0;
@


1.2
log
@update to 1.2.5
@
text
@@


1.1
log
@Make this play nice with PAM.

Approved by:	maintainer timeout
@
text
@d20 11
a30 11
--- ./doc/Configuration.html.orig	Mon Jan 21 16:28:02 2002
+++ ./doc/Configuration.html	Mon Jan 21 16:28:13 2002
@@@@ -712,7 +712,7 @@@@
 <hr>
 <h2><a name="AuthPAMConfig">AuthPAMConfig</a></h2>
 <p><strong>Syntax:</strong> AuthPAMConfig <em>service</em><br>
-  <strong>Default:</strong> ftp<br>
+  <strong>Default:</strong> ftpd<br>
   <strong>Context:</strong> server config,&lt;VirtualHost&gt;, &lt;Global&gt;<br>
   <STRONG>Module:</STRONG> mod_pam<BR>
   <strong>Compatibility:</strong> 1.2.0rc1 and later</p>
@

