From ralf.becker@its.uni-karlsruhe.de  Tue Oct 29 16:38:38 2002
Return-Path: <ralf.becker@its.uni-karlsruhe.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EB04337B401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 Oct 2002 16:38:37 -0800 (PST)
Received: from mailgate.rz.uni-karlsruhe.de (mailgate.rz.uni-karlsruhe.de [129.13.64.97])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E7BF743E97
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 Oct 2002 16:38:36 -0800 (PST)
	(envelope-from ralf.becker@its.uni-karlsruhe.de)
Received: from itsemail.its.uni-karlsruhe.de (itsemail.its.uni-karlsruhe.de [172.22.128.200])
	by mailgate.rz.uni-karlsruhe.de with esmtp (Exim 3.36 #1)
	id 186gsV-0003Vw-00; Wed, 30 Oct 2002 01:38:35 +0100
Received: from itstsv9 ([172.22.128.8] helo=itstsv9.its.uni-karlsruhe.de)
	by itsemail.its.uni-karlsruhe.de with esmtp (Exim 3.20 #3)
	id 186gsQ-0000YA-00
	for FreeBSD-gnats-submit@freebsd.org; Wed, 30 Oct 2002 01:38:30 +0100
Received: from localhost ([127.0.0.1] helo=itstsv9.its.uni-karlsruhe.de)
	by itstsv9.its.uni-karlsruhe.de with esmtp (Exim 3.35 #1)
	id 186gsR-0003QO-00
	for FreeBSD-gnats-submit@freebsd.org; Wed, 30 Oct 2002 01:38:31 +0100
Received: (from becker@localhost)
	by itstsv9.its.uni-karlsruhe.de (8.12.4/8.12.4/Submit) id g9U0cUfJ013167;
	Wed, 30 Oct 2002 01:38:30 +0100 (CET)
Message-Id: <200210300038.g9U0cUfJ013167@itstsv9.its.uni-karlsruhe.de>
Date: Wed, 30 Oct 2002 01:38:30 +0100 (CET)
From: Ralf Becker <ralf@akk.org>
Reply-To: Ralf Becker <ralf@akk.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update login.conf and unify login capabilities
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         44717
>Category:       conf
>Synopsis:       [patch] update login.conf and unify login capabilities
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 29 16:40:01 PST 2002
>Closed-Date:    Sun Aug 08 16:56:30 UTC 2010
>Last-Modified:  Sun Aug  8 17:00:17 UTC 2010
>Originator:     Ralf Becker
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
AKK Akrbeitskreis Kultur und Kommunikation
>Environment:
System: FreeBSD itstsv9.its.uni-karlsruhe.de 4.6-STABLE FreeBSD 4.6-STABLE #0: Thu Jun 27 15:11:23 CEST 2002 root@itstsv9.its.uni-karlsruhe.de:/usr/src/sys/compile/local270602 i386


>Description:
	Applies to:
	src/lib/libutil/login.conf.5 
	src/usr.bin/login.c

	The manpage of login.conf differ from the capabilties login(1) uses.
	The first patch add the documentation of the capabilities login_retries 
	and login_backoff login(1) knows to the login.conf manpage. 
	The second corrects the capabilty "prompt" used in login(1) to 
	"login_prompt" mentioned in the login.conf manpage.
>How-To-Repeat:
>Fix:
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	patch.login.c
#	patch.login.c
#
echo x - patch.login.c
sed 's/^X//' >patch.login.c << 'END-of-patch.login.c'
X*** login.c.orig	Tue Oct 29 21:07:17 2002
X--- login.c	Tue Oct 29 21:10:24 2002
X***************
X*** 248,260 ****
X  	 * Get "login-retries" & "login-backoff" from default class
X  	 */
X  	lc = login_getclass(NULL);
X! 	prompt = login_getcapstr(lc, "prompt",
X  	    default_prompt, default_prompt);
X  	passwd_prompt = login_getcapstr(lc, "passwd_prompt",
X  	    default_passwd_prompt, default_passwd_prompt);
X! 	retries = login_getcapnum(lc, "login-retries",
X  	    DEFAULT_RETRIES, DEFAULT_RETRIES);
X! 	backoff = login_getcapnum(lc, "login-backoff",
X  	    DEFAULT_BACKOFF, DEFAULT_BACKOFF);
X  	login_close(lc);
X  	lc = NULL;
X--- 248,260 ----
X  	 * Get "login-retries" & "login-backoff" from default class
X  	 */
X  	lc = login_getclass(NULL);
X! 	prompt = login_getcapstr(lc, "login_prompt",
X  	    default_prompt, default_prompt);
X  	passwd_prompt = login_getcapstr(lc, "passwd_prompt",
X  	    default_passwd_prompt, default_passwd_prompt);
X! 	retries = login_getcapnum(lc, "login_retries",
X  	    DEFAULT_RETRIES, DEFAULT_RETRIES);
X! 	backoff = login_getcapnum(lc, "login_backoff",
X  	    DEFAULT_BACKOFF, DEFAULT_BACKOFF);
X  	login_close(lc);
X  	lc = NULL;
END-of-patch.login.c
echo x - patch.login.c
sed 's/^X//' >patch.login.c << 'END-of-patch.login.c'
X*** login.c.orig	Tue Oct 29 21:07:17 2002
X--- login.c	Tue Oct 29 21:10:24 2002
X***************
X*** 248,260 ****
X  	 * Get "login-retries" & "login-backoff" from default class
X  	 */
X  	lc = login_getclass(NULL);
X! 	prompt = login_getcapstr(lc, "prompt",
X  	    default_prompt, default_prompt);
X  	passwd_prompt = login_getcapstr(lc, "passwd_prompt",
X  	    default_passwd_prompt, default_passwd_prompt);
X! 	retries = login_getcapnum(lc, "login-retries",
X  	    DEFAULT_RETRIES, DEFAULT_RETRIES);
X! 	backoff = login_getcapnum(lc, "login-backoff",
X  	    DEFAULT_BACKOFF, DEFAULT_BACKOFF);
X  	login_close(lc);
X  	lc = NULL;
X--- 248,260 ----
X  	 * Get "login-retries" & "login-backoff" from default class
X  	 */
X  	lc = login_getclass(NULL);
X! 	prompt = login_getcapstr(lc, "login_prompt",
X  	    default_prompt, default_prompt);
X  	passwd_prompt = login_getcapstr(lc, "passwd_prompt",
X  	    default_passwd_prompt, default_passwd_prompt);
X! 	retries = login_getcapnum(lc, "login_retries",
X  	    DEFAULT_RETRIES, DEFAULT_RETRIES);
X! 	backoff = login_getcapnum(lc, "login_backoff",
X  	    DEFAULT_BACKOFF, DEFAULT_BACKOFF);
X  	login_close(lc);
X  	lc = NULL;
END-of-patch.login.c
exit



>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: dougb 
State-Changed-When: Sun Feb 2 00:31:43 PST 2003 
State-Changed-Why:  

You attached two copies of the same patch. Could you please follow up 
to this PR with the actual diffs (not shar's), and please use diff -u. 


Responsible-Changed-From-To: freebsd-bugs->dougb 
Responsible-Changed-By: dougb 
Responsible-Changed-When: Sun Feb 2 00:31:43 PST 2003 
Responsible-Changed-Why:  

I'll handle the feedback. 

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

From: Ralf Becker <ralf@akk.org>
To: Doug Barton <dougb@FreeBSD.org>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: conf/44717: update login.conf and unify login capabilities
Date: Tue, 4 Feb 2003 00:29:58 +0100

 On Sun, Feb 02, 2003 at 12:32:55AM -0800, Doug Barton wrote:
 I'm sorry about the mistake.
 Below the the two diffs. They apply to the actual 4-STABLE Sources.
 
 patch to usr.bin/login:
 --- login.c.orig	Tue Feb  4 00:07:40 2003
 +++ login.c	Tue Feb  4 00:09:55 2003
 @@ -284,12 +284,13 @@
  	 * Get "login-retries" & "login-backoff" from default class
  	 */
  	lc = login_getclass(NULL);
 -	prompt = login_getcapstr(lc, "prompt", DEFAULT_PROMPT, DEFAULT_PROMPT);
 +	prompt = login_getcapstr(lc, "login_prompt", 
 +		DEFAULT_PROMPT, DEFAULT_PROMPT);
  	passwd_prompt = login_getcapstr(lc, "passwd_prompt",
  	    DEFAULT_PASSWD_PROMPT, DEFAULT_PASSWD_PROMPT);
 -	retries = login_getcapnum(lc, "login-retries", DEFAULT_RETRIES,
 +	retries = login_getcapnum(lc, "login_retries", DEFAULT_RETRIES,
  	    DEFAULT_RETRIES);
 -	backoff = login_getcapnum(lc, "login-backoff", DEFAULT_BACKOFF,
 +	backoff = login_getcapnum(lc, "login_backoff", DEFAULT_BACKOFF,
  	    DEFAULT_BACKOFF);
  	login_close(lc);
  	lc = NULL;
 
 patch to lib/libutil/login.conf.5:
 --- login.conf.5.orig	Tue Feb  4 00:06:35 2003
 +++ login.conf.5	Tue Feb  4 00:20:43 2003
 @@ -212,6 +212,12 @@
  in the class may not access.
  .It "login_prompt	string		The login prompt given by
  .Xr login 1
 +.It "login_retries	number	10	
 +.Xr login 1
 +will ask login_retries times for a valid login and password.
 +.It "login_backoff	number	6	After login_backoff retries
 +.Xr login 1
 +starts sleeping
  .It "minpasswordlen	number	6	The minimum length a local password
  may be.
  .It "mixpasswordcase	bool	true	Whether
 
 -- 
 Ralf Becker           ralf@akk.org 
 Arbeitskreis Kultur und Kommunikation / Universitaet Karlsruhe
 Paulckeplatz 1        76131 Karlsruhe
 Tel 0721/96403-22     Fax 0721/608-4019 
 --------------------
State-Changed-From-To: feedback->open 
State-Changed-By: dougb 
State-Changed-When: Wed Dec 21 09:05:25 UTC 2005 
State-Changed-Why:  

I'm sure that this is stale by now, but cast it back into 
the void rather than closing it on the off chance that 
someone might want to pick it up, or someone more 
knowledgeable than I can close it. 


Responsible-Changed-From-To: dougb->freebsd-bugs 
Responsible-Changed-By: dougb 
Responsible-Changed-When: Wed Dec 21 09:05:25 UTC 2005 
Responsible-Changed-Why:  

Back to the pool 

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

From: "Garrett Cooper" <yanefbsd@gmail.com>
To: bug-followup@FreeBSD.org, ralf@akk.org
Cc:  
Subject: Re: conf/44717: [patch] update login.conf and unify login capabilities
Date: Fri, 20 Jun 2008 17:56:39 -0700

 The bug (prompt vs login_prompt) is fixed in 8-CURRENT; however, this
 raises 2 points though:
 
 1. Stylistically, should all "login-*" references be replaced by
 "login_*" (I vote yes for consistency).
 2. While grep'ing the rest of the CVS tree I noticed that picobsd's
 login(1) suffers from the same issue mentioned in the PR. The catch is
 that I think that usr.bin/login/login.c and
 release/picobsd/tinyware/login/picobsd-login.c _SHOULD_ be merged to
 keep things consistent and to also make sure that any bugfixes made to
 usr.bin/login/login.c get propogated out to picobsd, or picobsd should
 be removed from the CVS tree as it's extremely out of date -- heck
 it's based off of 3.0, which was EOL'ed ages ago! Besides, there is
 the nanobsd project, which appears to be picking up better slack than
 picobsd is.
 
 2. should be discussed on a regular mailing list.
 Just my 2 cents.
 -Garrett
State-Changed-From-To: open->closed 
State-Changed-By: gavin 
State-Changed-When: Sun Aug 8 16:55:51 UTC 2010 
State-Changed-Why:  
The  issues in this PR were fixed many years ago, but the PR was never 
closed. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/44717: commit references a PR
Date: Sun,  8 Aug 2010 16:56:48 +0000 (UTC)

 Author: gavin
 Date: Sun Aug  8 16:55:27 2010
 New Revision: 211079
 URL: http://svn.freebsd.org/changeset/base/211079
 
 Log:
   Merge r114010 of head/usr.bin/login/login.c into PicoBSD's login.c:
   
   Correct the login.conf variable name used for obtaining the login prompt.
   
   PR:		conf/44717 (indirectly)
   Spotted by:	gcooper
   MFC after:	1 week
 
 Modified:
   head/release/picobsd/tinyware/login/pico-login.c
 
 Modified: head/release/picobsd/tinyware/login/pico-login.c
 ==============================================================================
 --- head/release/picobsd/tinyware/login/pico-login.c	Sun Aug  8 16:52:47 2010	(r211078)
 +++ head/release/picobsd/tinyware/login/pico-login.c	Sun Aug  8 16:55:27 2010	(r211079)
 @@ -279,7 +279,8 @@ main(argc, argv)
  	 * Get "login-retries" & "login-backoff" from default class
  	 */
  	lc = login_getclass(NULL);
 -	prompt = login_getcapstr(lc, "prompt", DEFAULT_PROMPT, DEFAULT_PROMPT);
 +	prompt = login_getcapstr(lc, "login_prompt",
 +	    DEFAULT_PROMPT, DEFAULT_PROMPT);
  	passwd_prompt = login_getcapstr(lc, "passwd_prompt",
  	    DEFAULT_PASSWD_PROMPT, DEFAULT_PASSWD_PROMPT);
  	retries = login_getcapnum(lc, "login-retries", DEFAULT_RETRIES,
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
