From owner-p4-projects@FreeBSD.ORG Thu Mar 9 01:20:05 2006 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 B1F3D16A423; Thu, 9 Mar 2006 01:20:04 +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 4E45316A420 for ; Thu, 9 Mar 2006 01:20:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEEA543D4C for ; Thu, 9 Mar 2006 01:20:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k291K3Kg095872 for ; Thu, 9 Mar 2006 01:20:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k291K3bL095869 for perforce@freebsd.org; Thu, 9 Mar 2006 01:20:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 9 Mar 2006 01:20:03 GMT Message-Id: <200603090120.k291K3bL095869@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93007 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: Thu, 09 Mar 2006 01:20:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=93007 Change 93007 by rwatson@rwatson_peppercorn on 2006/03/09 01:19:06 For reasons unknown, possibly the file was deleted and re-added, ppp in the SEBSD branch unnecessarily diverged from its parent branch. Forceably integrate and resolve it back to the parent branch contents. Affected files ... .. //depot/projects/trustedbsd/sebsd/etc/rc.d/ppp#3 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/etc/rc.d/ppp#3 (text+ko) ==== @@ -1,67 +1,48 @@ #!/bin/sh # -# $NetBSD: ppp,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ppp,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.11 2005/10/29 05:00:25 yar Exp $ # # PROVIDE: ppp -# REQUIRE: mountcritremote syslogd -# BEFORE: SERVERS -# -# Note that this means that syslogd will not be listening on -# any PPP addresses. This is considered a feature. -# +# REQUIRE: netif isdnd +# KEYWORD: nojail . /etc/rc.subr name="ppp" -start_cmd="ppp_start" -stop_cmd="ppp_stop" -sig_stop="-INT" -sig_hup="-HUP" -hup_cmd="ppp_hup" -extra_commands="hup" +rcvar=`set_rcvar` +command="/usr/sbin/${name}" +start_precmd="ppp_precmd" +start_postcmd="ppp_postcmd" -ppp_start() +ppp_precmd() { - # /etc/ppp/peers and $ppp_peers contain boot configuration - # information for pppd. each value in $ppp_peers that has a - # file in /etc/ppp/peers of the same name, will be run as - # `pppd call '. + # Establish ppp mode. # - if [ -n "$ppp_peers" ]; then - set -- $ppp_peers - echo -n "Starting pppd:" - while [ $# -ge 1 ]; do - peer=$1 - shift - if [ -f /etc/ppp/peers/$peer ]; then - pppd call $peer - echo -n " $peer" - fi - done - echo "." + if [ "${ppp_mode}" != "ddial" -a "${ppp_mode}" != "direct" \ + -a "${ppp_mode}" != "dedicated" \ + -a "${ppp_mode}" != "background" ]; then + ppp_mode="auto" fi -} + + rc_flags="$rc_flags -quiet -${ppp_mode}" + + # Switch on NAT mode? + # + case ${ppp_nat} in + [Yy][Ee][Ss]) + rc_flags="$rc_flags -nat" + ;; + esac -ppp_hup() -{ - pids="`check_process pppd`" - if [ -n "$pids" ]; then - for pid in $pids; do - kill $sig_hup $pid - done - fi + rc_flags="$rc_flags ${ppp_profile}" } -ppp_stop() +ppp_postcmd() { - pids="`check_process pppd`" - if [ -n "$pids" ]; then - for pid in $pids; do - kill $sig_stop $pid - done - fi + # Re-Sync ipfilter so it picks up any new network interfaces + # + /etc/rc.d/ipfilter resync } load_rc_config $name