From owner-trustedbsd-cvs@FreeBSD.ORG  Thu Feb 23 19:36:00 2006
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
X-Original-To: trustedbsd-cvs@freebsd.org
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BDC6516A422
	for <trustedbsd-cvs@freebsd.org>; Thu, 23 Feb 2006 19:36:00 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BDFC743D7D
	for <trustedbsd-cvs@freebsd.org>; Thu, 23 Feb 2006 19:35:47 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119])
	by cyrus.watson.org (Postfix) with ESMTP id 9A85C46BF1
	for <trustedbsd-cvs@trustedbsd.org>;
	Thu, 23 Feb 2006 14:35:29 -0500 (EST)
Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18])
	by mx2.freebsd.org (Postfix) with ESMTP id 78CAF64165;
	Thu, 23 Feb 2006 19:35:43 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6A20216A423; Thu, 23 Feb 2006 19:35:43 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1563C16A422
	for <perforce@freebsd.org>; Thu, 23 Feb 2006 19:35:43 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1D15143D79
	for <perforce@freebsd.org>; Thu, 23 Feb 2006 19:35:36 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1NJZa1V015957
	for <perforce@freebsd.org>; Thu, 23 Feb 2006 19:35:36 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1NJZaH4015954
	for perforce@freebsd.org; Thu, 23 Feb 2006 19:35:36 GMT
	(envelope-from millert@freebsd.org)
Date: Thu, 23 Feb 2006 19:35:36 GMT
Message-Id: <200602231935.k1NJZaH4015954@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 92289 for review
X-BeenThere: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: TrustedBSD CVS and Perforce commit message list
	<trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>, 
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Feb 2006 19:36:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=92289

Change 92289 by millert@millert_g4tower on 2006/02/23 19:34:48

	Don't overwrite /etc/xinetd.d/ssh

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/darwin/OpenSSH/Makefile#4 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/darwin/OpenSSH/Makefile#4 (text+ko) ====

@@ -62,8 +62,8 @@
 	$(_v) rmdir $(DSTROOT)/etc
 
 install-startup-item:
-	$(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/private/etc/xinetd.d
-	$(_v) $(INSTALL_FILE)   -c ssh-via-xinetd  $(DSTROOT)/private/etc/xinetd.d/ssh
+	#$(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/private/etc/xinetd.d
+	#$(_v) $(INSTALL_FILE)   -c ssh-via-xinetd  $(DSTROOT)/private/etc/xinetd.d/ssh
 	$(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/usr/libexec
 	$(_v) $(INSTALL_FILE) -m 555  -c sshd-keygen-wrapper $(DSTROOT)/usr/libexec/sshd-keygen-wrapper