Date: Wed, 24 May 2006 16:41:06 +0900 (JST) From: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/97774: [patch] ftp/wu-ftpd with pam Message-ID: <200605240741.k4O7f628020745@polymer3.scphys.kyoto-u.ac.jp> Resent-Message-ID: <200605240750.k4O7oDnq024746@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97774
>Category: ports
>Synopsis: [patch] ftp/wu-ftpd with pam
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed May 24 07:50:12 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Tsurutani Naoki
>Release: FreeBSD 5.5-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD polymer3.scphys.kyoto-u.ac.jp 5.5-PRERELEASE FreeBSD 5.5-PRERELEASE #19: Thu Mar 23 12:05:35 JST 2006 turutani@polymer3.scphys.kyoto-u.ac.jp:/usr/local/work/usr/obj/usr/src/sys/POLYMER i386
>Description:
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.
>How-To-Repeat:
>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
+ */
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605240741.k4O7f628020745>