From owner-freebsd-bugs  Wed Jul 10  6:40:14 2002
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 449AA37B400
	for <freebsd-bugs@hub.freebsd.org>; Wed, 10 Jul 2002 06:40:03 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A31AA43E52
	for <freebsd-bugs@hub.freebsd.org>; Wed, 10 Jul 2002 06:40:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6ADe2JU064559
	for <freebsd-bugs@freefall.freebsd.org>; Wed, 10 Jul 2002 06:40:02 -0700 (PDT)
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6ADe2Wm064558;
	Wed, 10 Jul 2002 06:40:02 -0700 (PDT)
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
X-Send-Pr-Version: 3.113
Subject: bin/40416: update for mergemaster.sh (login.conf.db rebuild)
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-bugs.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-bugs>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-bugs>
X-Loop: FreeBSD.org


>Number:         40416
>Category:       bin
>Synopsis:       update for mergemaster.sh (login.conf.db rebuild)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 10 06:40:01 PDT 2002
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message