From nobody@FreeBSD.org  Wed Oct  6 13:26:54 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 486C9106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  6 Oct 2010 13:26:54 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 37FB38FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  6 Oct 2010 13:26:54 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o96DQrRu029089
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 6 Oct 2010 13:26:53 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o96DQrt1029042;
	Wed, 6 Oct 2010 13:26:53 GMT
	(envelope-from nobody)
Message-Id: <201010061326.o96DQrt1029042@www.freebsd.org>
Date: Wed, 6 Oct 2010 13:26:53 GMT
From: Tz-Huan Huang <tzhuan@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: add option to net/nss_ldapd
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: melifaro@ipfw.ru

>Number:         151261
>Category:       ports
>Synopsis:       add option to net/nss_ldapd
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgollucci
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 06 13:30:01 UTC 2010
>Closed-Date:    Thu Dec 09 01:50:23 UTC 2010
>Last-Modified:  Thu Dec  9 02:00:23 UTC 2010
>Originator:     Tz-Huan Huang
>Release:        8.1-release
>Organization:
NTU CSIE
>Environment:
FreeBSD cml6.csie.ntu.edu.tw 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010     root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
When using nss_ldapd, the prompt of sshd will be "LDAP Password: " instead of original "Password: ", which sometimes confuses some user who don't know what LDAP is. This patch adds an option to solve the problem.
>How-To-Repeat:

>Fix:
diff -ruN nss_ldapd.orig/Makefile nss_ldapd/Makefile
--- nss_ldapd.orig/Makefile	2010-10-06 21:15:25.000000000 +0800
+++ nss_ldapd/Makefile	2010-10-06 21:14:35.000000000 +0800
@@ -26,7 +26,8 @@
 
 OPTIONS=		NSS_COMPAT	"Enable nss_ldap compatibility" on \
 			SASL		"Enable SASL" off \
-			PAM		"Build pam_ldap" on
+			PAM		"Build pam_ldap" on \
+			PROMPT  "Display only Password: instaed of LDAP Password:" off
 
 USERS=			nslcd
 GROUPS=			nslcd
@@ -92,6 +93,11 @@
 MAN8+=			nslcd.8
 .endif
 
+.if defined(WITH_PROMPT)
+post-patch:
+	@${REINPLACE_CMD} -e 's|i==0?"Password: ":"LDAP Password: "|"Password: "|' ${WRKSRC}/pam/pam.c
+.endif
+
 post-extract:
 	@${REINPLACE_CMD} -e 's/\(INSTALL_\)\(.*\)) -D /\1\2) /' ${WRKSRC}/Makefile.in ${WRKSRC}/nss/Makefile.in
 	@${REINPLACE_CMD} -e 's/shadow.$$(OBJEXT)/shadow.$$(OBJEXT) bsdnss.$$(OBJEXT)/;s/shadow\.c/shadow.c bsdnss.c/;s/exports\.linux/exports.freebsd/' ${WRKSRC}/nss/Makefile.in


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Oct 6 13:30:11 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=151261 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: melifaro@ipfw.ru
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/151261: add option to net/nss_ldapd
Date: Wed, 6 Oct 2010 13:30:08 UT

 Maintainer of net/nss_ldapd,
 
 Please note that PR ports/151261 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/151261
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->open 
State-Changed-By: pgollucci 
State-Changed-When: Thu Dec 9 01:03:20 UTC 2010 
State-Changed-Why:  
maintainer timeout (melifaro@ipfw.ru ; 64 days) 


Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: pgollucci 
Responsible-Changed-When: Thu Dec 9 01:03:20 UTC 2010 
Responsible-Changed-Why:  
maintainer timeout (melifaro@ipfw.ru ; 64 days) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=151261 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Thu Dec 9 01:50:21 UTC 2010 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=151261 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/151261: commit references a PR
Date: Thu,  9 Dec 2010 01:50:21 +0000 (UTC)

 pgollucci    2010-12-09 01:50:16 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/nss_ldapd        Makefile 
   Log:
   When using nss_ldapd, the prompt of sshd will be "LDAP Password: "
   instead of original "Password: ", which sometimes confuses some
   user who don't know what LDAP is. This patch adds an option to
   solve the problem.
   
   PR:             ports/151261
   Submitted by:   Tz-Huan Huang <tzhuan@gmail.com>
   Approved by:    maintainer timeout (melifaro@ipfw.ru ; 64 days)
   
   Revision  Changes    Path
   1.5       +7 -1      ports/net/nss_ldapd/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
