From 53a286a8f3f31d78d92ca12004d6c1acbc50f1ea Mon Sep 17 00:00:00 2001 From: max Date: Fri, 30 May 1997 18:38:11 +0000 Subject: Part 5/6 of the update: Remove dhcpdb.bind file if changed dhcpdb.pool file. If dhcpdb.pool file is changed and dhcpdb.bind file is not matched to new pool file, dhcp server(dhcps) can not run with some errors like this. * dhcps in free(): warning: modified (chunk-) pointer. * dhcps[25591]: hash_ins() with client identifier failed in read_bind_db() I fixed start-up script to remove dhcpdb.bind file when dhcpdb.pool file is newer than dhcpdb.bind. Install intro.dhcp.jis file into ${PREFIX}/share/dhcp dirctory. PR: 3717 Submitted-by: sanpei@yy.cs.keio.ac.jp --- net/wide-dhcp/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'net') diff --git a/net/wide-dhcp/Makefile b/net/wide-dhcp/Makefile index 86a87ad881f9..a2acd4f74f0c 100644 --- a/net/wide-dhcp/Makefile +++ b/net/wide-dhcp/Makefile @@ -3,7 +3,7 @@ # Date created: 21 November 1995 # Whom: Yoshiro MIHIRA # -# $Id: Makefile,v 1.7 1996/12/28 23:39:28 asami Exp $ +# $Id: Makefile,v 1.8 1997/04/04 02:19:46 brian Exp $ # DISTNAME= dhcp-1.3beta @@ -36,13 +36,21 @@ post-install: @${CP} ${WRKSRC}/db_sample/dhcpdb.relay ${PREFIX}/share/dhcp/dhcpdb.relay.sample @${CP} ${WRKSRC}/db_sample/dhcpdb.server ${PREFIX}/share/dhcp/dhcpdb.server.sample @${CP} ${WRKSRC}/db_sample/intro.dhcp ${PREFIX}/share/dhcp/ + @${CP} ${WRKSRC}/db_sample/intro.dhcp.jis ${PREFIX}/share/dhcp/ @if [ ! -f ${STARTUP_SCRIPT} ]; then \ echo "Installing ${STARTUP_SCRIPT} startup file."; \ echo '#!/bin/sh' > ${STARTUP_SCRIPT}; \ - echo 'if [ -f /etc/dhcpdb.pool -a -f /etc/dhcpdb.relay \'\ + echo 'DB_POOL=/etc/dhcpdb.pool' >> ${STARTUP_SCRIPT}; \ + echo 'DB_RELAY=/etc/dhcpdb.relay' >> ${STARTUP_SCRIPT}; \ + echo 'DB_BIND=/var/db/dhcpdb.bind' >> ${STARTUP_SCRIPT};\ + echo 'if [ -f $${DB_POOL} -a -f $${DB_RELAY} \'\ >> ${STARTUP_SCRIPT}; \ echo ' -a -x /usr/local/sbin/dhcps ]; then' \ >> ${STARTUP_SCRIPT}; \ + echo ' if [ -f $${DB_BIND} ]; then' >> ${STARTUP_SCRIPT};\ + echo ' find $${DB_POOL} -newer $${DB_BIND} -exec rm $${DB_BIND} \;'\ + >> ${STARTUP_SCRIPT}; \ + echo ' fi' >> ${STARTUP_SCRIPT}; \ echo " ${PREFIX}/sbin/dhcps [Intarface Name]" \ >> ${STARTUP_SCRIPT}; \ echo " echo -n ' dhcps'" \ -- cgit