Bug 97774 - [patch] ftp/wu-ftpd with pam
Summary: [patch] ftp/wu-ftpd with pam
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Munechika Sumikawa
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-05-24 08:50 UTC by TsurutaniNaoki
Modified: 2006-06-07 07:36 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description TsurutaniNaoki 2006-05-24 08:50:12 UTC
	A patch using ftp/wu-ftpd with PAM.
	Now, opie is enabled by default.
	Using PAM is exclusive with opie, but opie is able to be used
	through PAM.
	If you want to use PAM, build with "WITH_PAM=1".
	Otherwise, conventional way of using opie is used.
	Note: this patch is not tested well, but as known as I know,
	it works well with/without PAM, and with PAM, opie can also be used.

Fix: 

for ftp/wu-ftpd:
	--- Makefile.orig	Fri Dec  2 04:30:41 2005
	+++ Makefile	Wed May 24 16:23:16 2006
	@@ -21,9 +21,16 @@
	 CONFLICTS=	wu-ftpd+ipv6-[0-9]* heimdal-[0-9]*
	 
	 USE_AUTOTOOLS=	autoconf:213
	-CONFIGURE_ARGS=	--enable-rfc931 --disable-pasvip --enable-opie \
	+CONFIGURE_ARGS=	--enable-rfc931 --disable-pasvip \
	 		--enable-noop --disable-numericuid  --enable-nlst-dirs \
	 		--prefix=${PREFIX} --with-etc-dir=${PREFIX}/etc
	+
	+.if !defined(WITH_PAM)
	+CONFIGURE_ARGS+= --enable-opie
	+.else
	+CONFIGURE_ARGS+= --enable-pam
	+EXTRA_PATCHES+=	${FILESDIR}/ftpd.c-pam
	+.endif
	 
	 MAKE_ENV+=	WARNINGS=-DSPT_TYPE=SPT_BUILTIN
	 
	--- /dev/null	Wed May 24 16:30:16 2006
	+++ files/ftpd.c-pam	Wed May 24 16:25:06 2006
	@@ -0,0 +1,10 @@
	+--- src/ftpd.c.orig	Fri Nov 30 01:56:11 2001
	++++ src/ftpd.c	Wed May 24 16:21:21 2006
	+@@ -6926,6 +6926,7 @@
	+  */
	+ 
	+ #include <security/pam_appl.h>
	++#define PAM_ESTABLISH_CRED 0x1
	+ /* Static variables used to communicate between the conversation function
	+  * and the server_login function
	+  */

	for ftp/wu-ftpd+ipv6:
	--- Makefile.orig	Wed May 24 15:44:57 2006
	+++ Makefile	Wed May 24 16:05:11 2006
	@@ -24,10 +24,17 @@
	 CONFLICTS=	wu-ftpd-[0-9]* heimdal-[0-9]*
	 
	 USE_AUTOTOOLS=	autoconf:213
	-CONFIGURE_ARGS=	--enable-rfc931 --disable-pasvip --enable-opie \
	+CONFIGURE_ARGS=	--enable-rfc931 --disable-pasvip \
	 		--enable-noop --disable-numericuid  --enable-nlst-dirs \
	 		--enable-ipv6 \
	 		--prefix=${PREFIX} --with-etc-dir=${PREFIX}/etc
	+
	+.if !defined(WITH_PAM)
	+CONFIGURE_ARGS+= --enable-opie
	+.else
	+CONFIGURE_ARGS+= --enable-pam
	+EXTRA_PATCHES+=	${FILESDIR}/ftpd.c-pam
	+.endif
	 
	 MAKE_ENV+=	WARNINGS=-DSPT_TYPE=SPT_BUILTIN
	 
	--- /dev/null	Wed May 24 16:30:16 2006
	+++ files/ftpd.c-pam	Wed May 24 16:29:30 2006
	@@ -0,0 +1,10 @@
	+--- src/ftpd.c.orig	Wed May 24 16:28:10 2006
	++++ src/ftpd.c	Wed May 24 16:28:10 2006
	+@@ -7633,6 +7633,7 @@
	+  */
	+ 
	+ #include <security/pam_appl.h>
	++#define PAM_ESTABLISH_CRED 0x1
	+ /* Static variables used to communicate between the conversation function
	+  * and the server_login function
	+  */
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2006-05-24 08:52:18 UTC
Responsible Changed
From-To: freebsd-ports-bugs->ache

Over to maintainer
Comment 2 Andrey A. Chernov freebsd_committer freebsd_triage 2006-05-27 01:29:17 UTC
Responsible Changed
From-To: ache->freebsd-ports-bugs

My part of fix committed
Comment 3 Mark Linimon freebsd_committer freebsd_triage 2006-05-30 20:02:04 UTC
Responsible Changed
From-To: freebsd-ports-bugs->sumikawa

Over to maintainer of ftp/wu-ftpd+ipv6.
Comment 4 Munechika Sumikawa freebsd_committer freebsd_triage 2006-06-07 07:35:33 UTC
State Changed
From-To: open->closed

My part has been commited.