From owner-freebsd-bugs@FreeBSD.ORG Sun Dec 12 23:40:30 2004 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E5E116A502 for ; Sun, 12 Dec 2004 23:40:30 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1021843D58 for ; Sun, 12 Dec 2004 23:40:30 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iBCNeTQa062631 for ; Sun, 12 Dec 2004 23:40:29 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iBCNeTTe062627; Sun, 12 Dec 2004 23:40:29 GMT (envelope-from gnats) Resent-Date: Sun, 12 Dec 2004 23:40:29 GMT Resent-Message-Id: <200412122340.iBCNeTTe062627@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rostislav Krasny Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1603D16A4CE for ; Sun, 12 Dec 2004 23:39:16 +0000 (GMT) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00CB143D45 for ; Sun, 12 Dec 2004 23:39:16 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id iBCNdFKv093813 for ; Sun, 12 Dec 2004 23:39:15 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id iBCNdFx5093812; Sun, 12 Dec 2004 23:39:15 GMT (envelope-from nobody) Message-Id: <200412122339.iBCNdFx5093812@www.freebsd.org> Date: Sun, 12 Dec 2004 23:39:15 GMT From: Rostislav Krasny To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Subject: bin/75001: hushlogin and nocheckmail attributes don't work from user's '.login_conf' X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Dec 2004 23:40:31 -0000 >Number: 75001 >Category: bin >Synopsis: hushlogin and nocheckmail attributes don't work from user's '.login_conf' >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Dec 12 23:40:28 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Rostislav Krasny >Release: 5.3-RELEASE >Organization: >Environment: FreeBSD saturn 5.3-RELEASE-p2 FreeBSD 5.3-RELEASE-p2 #1: Fri Dec 3 13:57:01 IST 2004 root@saturn:/usr/obj/usr/src/sys/MYKERNEL i386 >Description: hushlogin and nocheckmail attributes don't work from user's '.login_conf' because they are not checked there. My patch of login(1) allows these attributes to work from the user's '.login_conf' as well as from the '/etc/login.conf'. >How-To-Repeat: Try each of following versions of your ~/.login_conf file: ####### first version ####### me:\ :hushlogin: ####### first version ####### ####### second version ####### me:\ :nocheckmail: ####### second version ####### And then relogin. >Fix: --- /usr/src/usr.bin/login/login.c Mon Jan 26 22:04:47 2004 +++ login.c Mon Dec 13 00:16:14 2004 @@ -171,6 +171,7 @@ const char *tp; const char *shell = NULL; login_cap_t *lc = NULL; + login_cap_t *lc_user = NULL; pid_t pid; (void)signal(SIGQUIT, SIG_IGN); @@ -354,8 +355,10 @@ * Establish the login class. */ lc = login_getpwclass(pwd); + lc_user = login_getuserclass(pwd); - quietlog = login_getcapbool(lc, "hushlogin", 0); + if (!(quietlog = login_getcapbool(lc_user, "hushlogin", 0))) + quietlog = login_getcapbool(lc, "hushlogin", 0); /* * Switching needed for NFS with root access disabled. @@ -568,7 +571,8 @@ else motd(_PATH_MOTDFILE); - if (login_getcapbool(lc, "nocheckmail", 0) == 0) { + if (login_getcapbool(lc_user, "nocheckmail", 0) == 0 && + login_getcapbool(lc, "nocheckmail", 0) == 0) { char *cx; /* $MAIL may have been set by class. */ >Release-Note: >Audit-Trail: >Unformatted: