From edwin@cgmd76206.chello.nl  Fri Mar  9 06:25:17 2001
Return-Path: <edwin@cgmd76206.chello.nl>
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
Subject: [PATCH] Upgrade install does not restore files in /etc/ssh
X-Send-Pr-Version: 3.2

>Number:         25633
>Category:       conf
>Synopsis:       [PATCH] Upgrade install does not restore files in /etc/ssh
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    jkh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 09 06:30:01 PST 2001
>Closed-Date:    Fri Mar 23 21:41:09 PST 2001
>Last-Modified:  Fri Mar 23 21:41:22 PST 2001
>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:
Responsible-Changed-From-To: freebsd-bugs->jkh 
Responsible-Changed-By: kris 
Responsible-Changed-When: Fri Mar 23 21:27:01 PST 2001 
Responsible-Changed-Why:  
jkh is Mr Sysinstall.  It would be worth checking during the resolution 
of this PR whether there are any other recently-added files/directories 
in /etc which also need to be treated specially by the upgrade target 

http://www.freebsd.org/cgi/query-pr.cgi?pr=25633 
State-Changed-From-To: open->closed 
State-Changed-By: jkh 
State-Changed-When: Fri Mar 23 21:41:09 PST 2001 
State-Changed-Why:  
Patch applied, thanks! 

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