From owner-p4-projects@FreeBSD.ORG Fri Aug 26 12:00:12 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 842C016A42D; Fri, 26 Aug 2005 12:00:11 +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 22CCD16A42D for ; Fri, 26 Aug 2005 12:00:11 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD68C43D45 for ; Fri, 26 Aug 2005 12:00:10 +0000 (GMT) (envelope-from soc-tyler@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 j7QC0Asi041110 for ; Fri, 26 Aug 2005 12:00:10 GMT (envelope-from soc-tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7QC0AQr041107 for perforce@freebsd.org; Fri, 26 Aug 2005 12:00:10 GMT (envelope-from soc-tyler@freebsd.org) Date: Fri, 26 Aug 2005 12:00:10 GMT Message-Id: <200508261200.j7QC0AQr041107@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-tyler@freebsd.org using -f From: soc-tyler To: Perforce Change Reviews Cc: Subject: PERFORCE change 82611 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Aug 2005 12:00:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=82611 Change 82611 by soc-tyler@soc-tyler_launchd on 2005/08/26 11:59:21 Update launchers/*.launch for testing with launchctl(1) using property(3) to parse out simple data. Affected files ... .. //depot/projects/soc2005/launchd/launchctl/launchctl.c#10 edit .. //depot/projects/soc2005/launchd/launchers/ftp.launch#4 edit .. //depot/projects/soc2005/launchd/launchers/ssh.launch#4 edit Differences ... ==== //depot/projects/soc2005/launchd/launchctl/launchctl.c#10 (text+ko) ==== @@ -3,26 +3,6 @@ * * Copyright (c) 2005 R. Tyler Ballance All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE * - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. */ /* @@ -48,16 +28,6 @@ * @APPLE_LICENSE_HEADER_END@ */ -/* Mac OS specific - * #include - * - * CoreFoundation defines a lot of these CF* data types, documentation is here: - * http://developer.apple.com/documentation/CoreFoundation/Reference/CFAPI-date.html - * - * refer to the eXpat XML parsing library by way of 'libbsdxml' for replacement of - * the XML parsing functions - */ - #ifdef _BUILD_DARWIN_ #include #endif ==== //depot/projects/soc2005/launchd/launchers/ftp.launch#4 (text+ko) ==== @@ -3,16 +3,7 @@ # Simple, launchd(8) launcher for the ftp daemon # -program = ftpd -progpath = /usr/libexec/ftpd -#firstboot = /usr/libexec/ftpd -progflags = -l +Label = org.freebsd.ftpd +Path = /usr/libexec/ftpd +Flags = -l -################################## -# Network related functions -################################## - -## inetd related options -### start this daemon from the (x)inetd super server -# inetd = false -# inetd_wait = false ==== //depot/projects/soc2005/launchd/launchers/ssh.launch#4 (text+ko) ==== @@ -3,16 +3,7 @@ # Simple, launchd(8) launcher for the SSH daemon # -program = sshd -progpath = /usr/bin/sshd -#firstboot = /some/script/to/do/keygen -progflags = -i +Label = org.openssh.sshd +Path = /usr/sbin/sshd +Flags = -D -################################## -# Network related functions -################################## - -## inetd related options -### start this daemon from the (x)inetd super server -# inetd = false -# inetd_wait = false