From owner-freebsd-bugs  Fri Mar  9  6:30: 7 2001
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 8ACB337B71A
	for <freebsd-bugs@hub.freebsd.org>; Fri,  9 Mar 2001 06:30:01 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f29EU1T15950;
	Fri, 9 Mar 2001 06:30:01 -0800 (PST)
	(envelope-from gnats)
Received: from cgmd76206.chello.nl (d9168.upc-d.chello.nl [213.46.9.168])
	by hub.freebsd.org (Postfix) with ESMTP id 63DF637B71A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  9 Mar 2001 06:25:16 -0800 (PST)
	(envelope-from edwin@cgmd76206.chello.nl)
Received: by cgmd76206.chello.nl (Postfix, from userid 1001)
	id 3B6941AB; Fri,  9 Mar 2001 15:25:15 +0100 (CET)
Message-Id: <20010309142515.3B6941AB@cgmd76206.chello.nl>
Date: Fri,  9 Mar 2001 15:25:15 +0100 (CET)
From: edwin@mavetju.org
Reply-To: edwin@mavetju.org
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: conf/25633: [PATCH] Upgrade install does not restore files in /etc/ssh
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         25633
>Category:       conf
>Synopsis:       [PATCH] Upgrade install does not restore files in /etc/ssh
>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:   Fri Mar 09 06:30:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Edwin Groothuis
>Release:        FreeBSD 4.2-RELEASE i386
>Organization:
-
>Environment:

	4.2-RELEASE `Upgrade' install

>Description:

	I have a more-or-less heavily modified ssh_config with lots
	of individual Host statements. After the upgrade to 4.2
	these were suddenly replaced by the standard ssh config-files.

	So the problem is: Preexisting files in /etc/ssh are not restored.

	Luckely it didn't kill my hostkey :-)

>How-To-Repeat:

	Do a 4.2-RELEASE `Upgrade' install

>Fix:

--- installUpgrade.c.old	Fri Mar  9 15:12:17 2001
+++ installUpgrade.c	Fri Mar  9 15:12:47 2001
@@ -116,6 +116,7 @@
    { JUST_COPY,		"shells",		TRUE, NULL },
    { JUST_COPY,		"skeykeys",		TRUE, NULL },
    { JUST_COPY,		"spwd.db",		TRUE, NULL },
+   { JUST_COPY,		"ssh",			TRUE, NULL },
    { JUST_COPY,		"syslog.conf",		TRUE, NULL },
    { JUST_COPY,		"ttys",			TRUE, NULL },
    { JUST_COPY,		"uucp",			TRUE, NULL },

>Release-Note:
>Audit-Trail:
>Unformatted:

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