summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2005-06-07 04:02:10 +0000
committerbrooks <brooks@FreeBSD.org>2005-06-07 04:02:10 +0000
commit490c515d028d45f4c13c396411b70e9632505a6c (patch)
tree99ab3580b220b9f69ccb09ecfceadd89eb0685a2
parent889029339427479400173e85589ca167386d5d1d (diff)
downloadFreeBSD-src-490c515d028d45f4c13c396411b70e9632505a6c.zip
FreeBSD-src-490c515d028d45f4c13c396411b70e9632505a6c.tar.gz
Remove the bits to build the isc-dhclient.
-rw-r--r--sbin/dhclient/Makefile.inc48
-rw-r--r--sbin/dhclient/client/Makefile27
-rw-r--r--sbin/dhclient/common/Makefile20
-rw-r--r--sbin/dhclient/dhclient-script.sh514
-rw-r--r--sbin/dhclient/dhcpctl/Makefile15
-rw-r--r--sbin/dhclient/dst/Makefile15
-rw-r--r--sbin/dhclient/minires/Makefile25
-rw-r--r--sbin/dhclient/omapip/Makefile18
-rw-r--r--sbin/dhclient/omshell/Makefile12
9 files changed, 0 insertions, 694 deletions
diff --git a/sbin/dhclient/Makefile.inc b/sbin/dhclient/Makefile.inc
deleted file mode 100644
index 090d208..0000000
--- a/sbin/dhclient/Makefile.inc
+++ /dev/null
@@ -1,48 +0,0 @@
-# $FreeBSD$
-
-MAINTAINER= mbr
-
-WARNS?= 0
-CFLAGS+= -I${DIST_DIR}/includes -DENABLE_POLLING_MODE -DNOMINUM
-
-CLIENTBINDIR= /sbin
-RUNDIR= /var/run
-ETCDIR= /etc
-DBDIR= /var/db
-
-MANFILTER= sed -e 's|DBDIR|${DBDIR}|g' \
- -e 's|ETCDIR|${ETCDIR}|g' \
- -e 's|CLIENTBINDIR|${CLIENTBINDIR}|g' \
- -e 's|RUNDIR|${RUNDIR}|g'
-
-.if exists(${.OBJDIR}/../common)
-LIBDHCP= ${.OBJDIR}/../common/libdhcp.a
-.else
-LIBDHCP= ${.CURDIR}/../common/libdhcp.a
-.endif
-
-.if exists(${.OBJDIR}/../minires)
-LIBRES= ${.OBJDIR}/../minires/libres.a
-.else
-LIBRES= ${.CURDIR}/../minires/libres.a
-.endif
-
-.if exists(${.OBJDIR}/../omapip)
-LIBOMAPI= ${.OBJDIR}/../omapip/libomapi.a
-.else
-LIBOMAPI= ${.CURDIR}/../omapip/libomapi.a
-.endif
-
-.if exists(${.OBJDIR}/../dst)
-LIBDST= ${.OBJDIR}/../dst/libdst.a
-.else
-LIBDST= ${.CURDIR}/../dst/libdst.a
-.endif
-
-.if exists(${.OBJDIR}/../dhcpctl)
-LIBDHCPCTL= ${.OBJDIR}/../dhcpctl/libdhcpctl.a
-.else
-LIBDHCPCTL= ${.CURDIR}/../dhcpctl/libdhcpctl.a
-.endif
-
-.include "../Makefile.inc"
diff --git a/sbin/dhclient/client/Makefile b/sbin/dhclient/client/Makefile
deleted file mode 100644
index c82c912..0000000
--- a/sbin/dhclient/client/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# client
-# $FreeBSD$
-
-DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
-
-.PATH: ${DIST_DIR}/client
-
-PROG= dhclient
-SRCS= clparse.c dhclient.c
-
-.if defined(RESCUE)
-CFLAGS+= -DCLIENT_PATH='"PATH=/rescue:/sbin:/bin:/usr/sbin:/usr/bin"'
-.else
-CFLAGS+= -DCLIENT_PATH='"PATH=/sbin:/bin:/usr/sbin:/usr/bin"'
-.endif
-CFLAGS+= -Dwarn=dhcp_warn
-
-DPADD= ${LIBDHCP} ${LIBRES} ${LIBOMAPI} ${LIBDST}
-LDADD= ${LIBDHCP} ${LIBRES} ${LIBOMAPI} ${LIBDST}
-
-SCRIPTS= scripts/freebsd
-SCRIPTSNAME= dhclient-script
-
-MAN= dhclient.conf.5 dhclient.leases.5
-MAN+= dhclient.8 dhclient-script.8
-
-.include <bsd.prog.mk>
diff --git a/sbin/dhclient/common/Makefile b/sbin/dhclient/common/Makefile
deleted file mode 100644
index 8ce6d11..0000000
--- a/sbin/dhclient/common/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# common
-# $FreeBSD$
-
-DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
-
-.PATH: ${DIST_DIR}/common
-
-LIB= dhcp
-INTERNALLIB=
-
-SRCS= alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c dispatch.c \
- dlpi.c dns.c ethernet.c execute.c fddi.c icmp.c inet.c lpf.c \
- memory.c nit.c options.c packet.c parse.c print.c raw.c resolv.c \
- socket.c tables.c tr.c tree.c upf.c
-
-CFLAGS+= -I${DIST_DIR}
-
-MAN= dhcp-eval.5 dhcp-options.5
-
-.include <bsd.lib.mk>
diff --git a/sbin/dhclient/dhclient-script.sh b/sbin/dhclient/dhclient-script.sh
deleted file mode 100644
index d35eafe..0000000
--- a/sbin/dhclient/dhclient-script.sh
+++ /dev/null
@@ -1,514 +0,0 @@
-#!/bin/sh
-
-#############################################################################
-#
-# Copyright (c) 1999, MindStep Corporation
-# 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 THE 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 THE 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.
-#
-#
-#############################################################################
-#
-# This script was written by Patrick Bihan-Faou, patrick@mindstep.com,
-# Please contact us for bug reports, etc.
-#
-#############################################################################
-# $MindStep_Id: dhclient-script.sh,v 1.8 1999/12/07 22:11:08 patrick Exp $
-# $MindStep_Tag: CONTRIB_19991207 $
-# $FreeBSD$
-#############################################################################
-
-
-#############################################################################
-# hook functions prototypes
-#
-# The "pre_state_XXX_hook" functions are called before the main
-# work is done for the state XXX
-#
-# The "post_state_XXX_hook" functions are called after the main
-# work is done for the state XXX
-#
-# These functions are meant to be overridden by the user's
-# dhclient-enter-hooks file
-#############################################################################
-
-pre_state_MEDIUM_hook () { }
-pre_state_PREINIT_hook () { }
-pre_state_ARPCHECK_hook () { }
-pre_state_ARPSEND_hook () { }
-pre_state_RENEW_hook () { }
-pre_state_REBIND_hook () { }
-pre_state_BOUND_hook () { }
-pre_state_REBOOT_hook () { }
-pre_state_EXPIRE_hook () { }
-pre_state_FAIL_hook () { }
-pre_state_TIMEOUT_hook () { }
-post_state_MEDIUM_hook () { }
-post_state_PREINIT_hook () { }
-post_state_ARPCHECK_hook () { }
-post_state_ARPSEND_hook () { }
-post_state_RENEW_hook () { }
-post_state_REBIND_hook () { }
-post_state_BOUND_hook () { }
-post_state_REBOOT_hook () { }
-post_state_EXPIRE_hook () { }
-post_state_FAIL_hook () { }
-post_state_TIMEOUT_hook () { }
-
-#############################################################################
-# make_resolv_conf
-#
-# This function is called to update the information related to the
-# DNS configuration (the resolver part)
-#############################################################################
-make_resolv_conf ()
-{
- if [ "x$new_domain_name" != x ] && [ "x$new_domain_name_servers" != x ]; then
- echo search $new_domain_name >/etc/resolv.conf
- for nameserver in $new_domain_name_servers; do
- echo nameserver $nameserver >>/etc/resolv.conf
- done
- fi
-}
-
-# Must be used on exit. Invokes the local dhcp client exit hooks, if any.
-exit_with_hooks () {
- exit_status=$1
- if [ -x /etc/dhclient-exit-hooks ]; then
- . /etc/dhclient-exit-hooks
- fi
-# probably should do something with exit status of the local script
- return $exit_status
-}
-
-#############################################################################
-# set_XXX
-# unset_XXX
-#
-# These function each deal with one particular setting.
-# They are OS dependent and may be overridden in the
-# dhclient-enter-hooks file if needed.
-#
-# These functions are called with either "new" or "old" to indicate which
-# set of variables to use (new_ip_address or old_ip_address...)
-#
-#############################################################################
-
-update_hostname ()
-{
- local current_hostname=`/bin/hostname`
- if [ "$current_hostname" = "" ] || \
- [ "$current_hostname" = "$old_host_name" ]
- then
- if [ "$new_host_name" != "$old_host_name" ]
- then
- $LOGGER "New Hostname: $new_host_name"
- hostname $new_host_name
- fi
- fi
-}
-
-set_ip_address ()
-{
- local ip
- local mask
- local bcast
-
- if [ $# -lt 1 ]
- then
- return 1
- fi
-
- eval ip="\$${1}_ip_address"
- eval mask="\$${1}_subnet_mask"
- eval bcast="\$${1}_broadcast_address"
-
- if [ "$ip" != "" ]
- then
- ifconfig $interface inet $ip netmask $mask broadcast $bcast $medium
-# route add $ip 127.0.0.1 > /dev/null 2>&1
- fi
-}
-
-unset_ip_address ()
-{
- local ip
-
- if [ $# -lt 1 ]
- then
- return 1
- fi
-
- eval ip="\$${1}_ip_address"
-
- if [ "$ip" != "" ]
- then
- ifconfig $interface inet -alias $ip $medium
-# route delete $ip 127.0.0.1 > /dev/null 2>&1
- fi
-}
-
-set_ip_alias ()
-{
- if [ "$alias_ip_address" != "" ]
- then
- ifconfig $interface inet alias $alias_ip_address netmask $alias_subnet_mask
-# route add $alias_ip_address 127.0.0.1
- fi
-}
-
-unset_ip_alias ()
-{
- if [ "$alias_ip_address" != "" ]
- then
- ifconfig $interface inet -alias $alias_ip_address > /dev/null 2>&1
-# route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
- fi
-}
-
-set_routers ()
-{
- local router_list
-
- if [ $# -lt 1 ]
- then
- return 1
- fi
-
- eval router_list="\$${1}_routers"
-
- for router in $router_list
- do
- route add default $router >/dev/null 2>&1
- done
-}
-
-unset_routers ()
-{
- local router_list
-
- if [ $# -lt 1 ]
- then
- return 1
- fi
-
- eval router_list="\$${1}_routers"
-
- for router in $router_list
- do
- route delete default $router >/dev/null 2>&1
- done
-}
-
-set_static_routes ()
-{
- local static_routes
-
- if [ $# -lt 1 ]
- then
- return 1
- fi
-
- eval static_routes="\$${1}_static_routes"
-
- set static_routes
-
- while [ $# -ge 2 ]
- do
- $LOGGER "New Static Route: $1 -> $2"
- route add $1 $2
- shift; shift
- done
-}
-
-unset_static_routes ()
-{
- local static_routes
-
- if [ $# -lt 1 ]
- then
- return 1
- fi
-
- eval static_routes="\$${1}_static_routes"
-
- set static_routes
-
- while [ $# -ge 2 ]
- do
- route delete $1 $2
- shift; shift
- done
-}
-
-#############################################################################
-#
-# utility functions grouping what needs to be done in logical units.
-#
-#############################################################################
-
-set_all ()
-{
- set_ip_address new
- set_routers new
- set_static_routes new
-
- if [ "$new_ip_address" != "$alias_ip_address" ]
- then
- set_ip_alias
- fi
-}
-
-set_others ()
-{
- update_hostname
- make_resolv_conf
-}
-
-clear_arp_table ()
-{
- arp -d -a
-}
-
-unset_all ()
-{
- if [ "$alias_ip_address" != "$old_ip_address" ]
- then
- unset_ip_alias
- fi
-
- if [ "$old_ip_address" != "" ]
- then
- unset_ip_address old
- unset_routers old
- unset_static_routes old
- clear_arp_table
- fi
-}
-
-test_new_lease ()
-{
- local rc
-
- set $new_routers
-
- if [ $# -ge 1 ]
- then
- set_ip_address new
- if ping -q -c 1 $1
- then
- rc=0
- else
- rc=1
- fi
- unset_ip_address new
- else
- rc=1
- fi
- return $rc
-}
-
-#############################################################################
-# Main State functions.
-#
-# There is a state function for each state of the DHCP client
-# These functions are OS specific and should be be tampered with.
-#############################################################################
-
-in_state_MEDIUM ()
-{
- ifconfig $interface $medium
- ifconfig $interface inet -alias 0.0.0.0 $medium >/dev/null 2>&1
- sleep 1
- exit_status=0
-}
-
-in_state_PREINIT ()
-{
- unset_ip_alias
-
- ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
- broadcast 255.255.255.255 up
- exit_status=0
-}
-
-in_state_ARPCHECK ()
-{
- exit_status=0
-}
-
-in_state_ARPSEND ()
-{
- exit_status=0
-}
-
-in_state_RENEW ()
-{
- if [ "$old_ip_address" != "$new_ip_address" ]
- then
- unset_all
- set_all
- fi
-
- set_others
-}
-
-in_state_REBIND () {
- in_state_RENEW
-}
-
-in_state_BOUND () {
- unset_all
- set_all
- set_others
-}
-
-in_state_REBOOT () {
- in_state_BOUND
-}
-
-in_state_EXPIRE ()
-{
- unset_all
- set_ip_alias
- exit_status=0
-}
-
-in_state_FAIL () {
- in_state_EXPIRE
-}
-
-in_state_TIMEOUT ()
-{
- unset_all
-
- if test_new_lease
- then
- set_all
- set_others
- else
- $LOGGER "No good lease information in TIMEOUT state"
- set_ip_alias
- exit_status=1
- fi
-}
-
-#############################################################################
-# Main functions:
-#
-# dhclient_script_init() parses the optional "enter_hooks" script which can
-# override any of the state functions
-#
-# This function also parses the variables and notifies the detected changes.
-#############################################################################
-dhclient_script_init ()
-{
- if [ -x /usr/bin/logger ]; then
- LOGGER="/usr/bin/logger -s -p user.notice -t dhclient"
- else
- LOGGER=echo
- fi
-
- # Invoke the local dhcp client enter hooks, if they exist.
- if [ -x /etc/dhclient-enter-hooks ]
- then
- exit_status=0
- . /etc/dhclient-enter-hooks
- # allow the local script to abort processing of this state
- # local script must set exit_status variable to nonzero.
- if [ $exit_status -ne 0 ]
- then
- exit $exit_status
- fi
- fi
-
- if [ "$new_network_number" != "" ]
- then
- $LOGGER "New Network Number: $new_network_number"
- fi
-
- if [ "$new_ip_address" != "" ]
- then
- $LOGGER "New IP Address: $new_ip_address"
- fi
-
- if [ "$new_broadcast_address" != "" ]
- then
- $LOGGER "New Broadcast Address: $new_broadcast_address"
- fi
-
- if [ "$new_subnet_mask" != "" ]
- then
- $LOGGER "New Subnet Mask for $interface: $new_subnet_mask"
- fi
-
- if [ "$alias_subnet_mask" != "" ]
- then
- fi
-}
-
-#############################################################################
-# dhclient_main() does the appropriate work depending on the state of
-# the dhcp client
-#############################################################################
-dhclient_script_main ()
-{
-# set -x
- exit_status=0
-
- case $reason in
- MEDIUM|\
- PREINIT|\
- ARPCHECK|\
- ARPSEND|\
- RENEW|\
- REBIND|\
- BOUND|\
- REBOOT|\
- EXPIRE|\
- FAIL|\
- TIMEOUT)
- pre_state_${reason}_hook
- in_state_${reason}
- post_state_${reason}_hook
- ;;
- *)
- $LOGGER "dhclient-script called with invalid reason $reason"
- exit_status=1
- ;;
- esac
-
- exit_with_hooks $exit_status
-}
-
-#############################################################################
-# Let's do the work...
-#############################################################################
-
-dhclient_script_init
-dhclient_script_main
-exit $exit_status
-
-#############################################################################
-# That's all folks
-#############################################################################
diff --git a/sbin/dhclient/dhcpctl/Makefile b/sbin/dhclient/dhcpctl/Makefile
deleted file mode 100644
index ec0f27e..0000000
--- a/sbin/dhclient/dhcpctl/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
-
-.PATH: ${DIST_DIR}/dhcpctl
-
-LIB= dhcpctl
-INTERNALLIB=
-
-SRCS= dhcpctl.c callback.c remote.c
-
-MAN= dhcpctl.3
-NO_MAN=
-
-.include <bsd.lib.mk>
diff --git a/sbin/dhclient/dst/Makefile b/sbin/dhclient/dst/Makefile
deleted file mode 100644
index b200f0d..0000000
--- a/sbin/dhclient/dst/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# dst
-# $FreeBSD$
-
-DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
-
-.PATH: ${DIST_DIR}/dst
-
-LIB= dst
-INTERNALLIB=
-
-SRCS= base64.c dst_api.c dst_support.c hmac_link.c md5_dgst.c prandom.c
-
-CFLAGS+= -DHMAC_MD5 -DMINIRES_LIB
-
-.include <bsd.lib.mk>
diff --git a/sbin/dhclient/minires/Makefile b/sbin/dhclient/minires/Makefile
deleted file mode 100644
index df5d18e..0000000
--- a/sbin/dhclient/minires/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# minires
-# $FreeBSD$
-
-DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
-
-.PATH: ${DIST_DIR}/minires
-
-LIB= res
-INTERNALLIB=
-
-SRCS= ns_date.c ns_name.c ns_parse%FIXED.c ns_samedomain.c ns_sign.c ns_verify.c \
- res_comp.c res_findzonecut.c res_init.c res_mkquery.c res_mkupdate.c \
- res_query%FIXED.c res_send.c res_sendsigned.c res_update.c
-
-CFLAGS+= -DHMAC_MD5 -DMINIRES_LIB
-
-CLEANFILES+= ns_parse%FIXED.c res_query%FIXED.c
-ns_parse%FIXED.c: ns_parse.c
- sed 's/struct _ns_flagdata _ns_flagdata/struct _ns_flagdata _ns_flagdata_DONT/' \
- ${.ALLSRC} > ${.TARGET}
-res_query%FIXED.c: res_query.c
- sed -e 's/RES_SET_H_ERRNO(\(.*\),\(.*\))/(h_errno = (\1)->res_h_errno = (\2))/' \
- ${.ALLSRC} > ${.TARGET}
-
-.include <bsd.lib.mk>
diff --git a/sbin/dhclient/omapip/Makefile b/sbin/dhclient/omapip/Makefile
deleted file mode 100644
index acda115..0000000
--- a/sbin/dhclient/omapip/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# omapip
-# $FreeBSD$
-
-DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
-
-.PATH: ${DIST_DIR}/omapip
-
-LIB= omapi
-INTERNALLIB=
-
-SRCS= alloc.c array.c auth.c buffer.c connection.c convert.c dispatch.c \
- errwarn.c generic.c handle.c hash.c inet_addr.c listener.c \
- message.c mrtrace.c protocol.c result.c support.c toisc.c trace.c
-
-MAN= omapi.3
-NO_MAN=
-
-.include <bsd.lib.mk>
diff --git a/sbin/dhclient/omshell/Makefile b/sbin/dhclient/omshell/Makefile
deleted file mode 100644
index 41aee14..0000000
--- a/sbin/dhclient/omshell/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp
-
-.PATH: ${DIST_DIR}/dhcpctl
-
-PROG= omshell
-
-DPADD= ${LIBDHCP} ${LIBRES} ${LIBOMAPI} ${LIBDST} ${LIBDHCPCTL}
-LDADD= ${LIBDHCP} ${LIBRES} ${LIBOMAPI} ${LIBDST} ${LIBDHCPCTL}
-
-.include <bsd.prog.mk>
OpenPOWER on IntegriCloud