diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-02-18 21:35:50 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-02-18 21:35:50 +0000 |
| commit | 7229a6c7db3bcbc9ae0782f98ddc5fd5857ea5ae (patch) | |
| tree | 2461cbcfc1555c1e82fde92b9b54285f428da4c1 /ftp | |
| parent | Pre-create symlink to a Java plugin, so that the user only needs to install (diff) | |
Make this play nice with PAM.
Approved by: maintainer timeout
Notes
Notes:
svn path=/head/; revision=54874
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/proftpd-devel/Makefile | 1 | ||||
| -rw-r--r-- | ftp/proftpd-devel/files/patch-pam | 41 | ||||
| -rw-r--r-- | ftp/proftpd/Makefile | 1 | ||||
| -rw-r--r-- | ftp/proftpd/files/patch-pam | 41 |
4 files changed, 84 insertions, 0 deletions
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile index 327f138b1756..b816607772e6 100644 --- a/ftp/proftpd-devel/Makefile +++ b/ftp/proftpd-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= proftpd PORTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.net/distrib/source/ \ ftp://ftp.stikman.com/pub/proftpd/source/ \ diff --git a/ftp/proftpd-devel/files/patch-pam b/ftp/proftpd-devel/files/patch-pam new file mode 100644 index 000000000000..ad29307da719 --- /dev/null +++ b/ftp/proftpd-devel/files/patch-pam @@ -0,0 +1,41 @@ +--- ./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 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,<VirtualHost>, <Global><br> + <STRONG>Module:</STRONG> mod_pam<BR> + <strong>Compatibility:</strong> 1.2.0rc1 and later</p> +--- ./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; diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index 327f138b1756..b816607772e6 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -7,6 +7,7 @@ PORTNAME= proftpd PORTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.net/distrib/source/ \ ftp://ftp.stikman.com/pub/proftpd/source/ \ diff --git a/ftp/proftpd/files/patch-pam b/ftp/proftpd/files/patch-pam new file mode 100644 index 000000000000..ad29307da719 --- /dev/null +++ b/ftp/proftpd/files/patch-pam @@ -0,0 +1,41 @@ +--- ./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 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,<VirtualHost>, <Global><br> + <STRONG>Module:</STRONG> mod_pam<BR> + <strong>Compatibility:</strong> 1.2.0rc1 and later</p> +--- ./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; |