From marck@woozle.rinet.ru  Wed Jul 10 06:30:25 2002
Return-Path: <marck@woozle.rinet.ru>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 48AEA37B400
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 10 Jul 2002 06:30:25 -0700 (PDT)
Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0177043E3B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 10 Jul 2002 06:30:24 -0700 (PDT)
	(envelope-from marck@woozle.rinet.ru)
Received: (from marck@localhost)
	by woozle.rinet.ru (8.11.6/8.11.6) id g6ADUMq12320;
	Wed, 10 Jul 2002 17:30:22 +0400 (MSD)
	(envelope-from marck)
Message-Id: <200207101330.g6ADUMq12320@woozle.rinet.ru>
Date: Wed, 10 Jul 2002 17:30:22 +0400 (MSD)
From: Dmitry Morozovsky <marck@rinet.ru>
Reply-To: Dmitry Morozovsky <marck@rinet.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update for mergemaster.sh (login.conf.db rebuild)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         40416
>Category:       bin
>Synopsis:       update for mergemaster.sh (login.conf.db rebuild)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 10 06:40:01 PDT 2002
>Closed-Date:    Mon Jul 15 01:24:31 PDT 2002
>Last-Modified:  Mon Jul 15 01:24:31 PDT 2002
>Originator:     Dmitry Morozovsky
>Release:        FreeBSD 4-STABLE i386
>Organization:
Cronyx Plus LLC (RiNet ISP)
>Environment:
System: FreeBSD 4-STABLE 



>Description:
	During update process, mergemaster asks whether you want to rebuild
/etc/login.conf.db (when /etc/login.conf is updated) even if DB does not
exist. The following small patch addresses this issue.

>How-To-Repeat:
>Fix:

Index: mergemaster.sh
===================================================================
RCS file: /home/ncvs/src/usr.sbin/mergemaster/mergemaster.sh,v
retrieving revision 1.6.2.14
diff -u -r1.6.2.14 mergemaster.sh
--- mergemaster.sh      30 Jun 2002 19:01:35 -0000      1.6.2.14
+++ mergemaster.sh      10 Jul 2002 13:27:27 -0000
@@ -657,7 +657,7 @@
       NEED_NEWALIASES=yes
       ;;
     /etc/login.conf)
-      NEED_CAP_MKDB=yes
+      [ -r /etc/login.conf.db ] && NEED_CAP_MKDB=yes
       ;;
     /etc/master.passwd)
       do_install_and_rm 600 "${1}" "${DESTDIR}${INSTALL_DIR}"

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: dougb 
State-Changed-When: Mon Jul 15 01:23:31 PDT 2002 
State-Changed-Why:  

Thank you for your submission, however I like the current behavior 
because if the user doesn't have a db already, they probably should 
(it's faster); and admins who know they don't want one can just say no. 


Responsible-Changed-From-To: freebsd-bugs->dougb 
Responsible-Changed-By: dougb 
Responsible-Changed-When: Mon Jul 15 01:23:31 PDT 2002 
Responsible-Changed-Why:  

mergemaster is my baby. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=40416 
>Unformatted:
