Attachment #960 for bug #3717

View | Details | Raw Unified | Return to bug 3717
Collapse All | Expand All

Lines 36-48 Link Here

(-)wide-dhcp/Makefile (-1 / +9 lines)
36	@${CP} ${WRKSRC}/db_sample/dhcpdb.relay ${PREFIX}/share/dhcp/dhcpdb.relay.sample	36	@${CP} ${WRKSRC}/db_sample/dhcpdb.relay ${PREFIX}/share/dhcp/dhcpdb.relay.sample
37	@${CP} ${WRKSRC}/db_sample/dhcpdb.server ${PREFIX}/share/dhcp/dhcpdb.server.sample	37	@${CP} ${WRKSRC}/db_sample/dhcpdb.server ${PREFIX}/share/dhcp/dhcpdb.server.sample
38	@${CP} ${WRKSRC}/db_sample/intro.dhcp ${PREFIX}/share/dhcp/	38	@${CP} ${WRKSRC}/db_sample/intro.dhcp ${PREFIX}/share/dhcp/
		39	@${CP} ${WRKSRC}/db_sample/intro.dhcp.jis ${PREFIX}/share/dhcp/
39	@if [ ! -f ${STARTUP_SCRIPT} ]; then \	40	@if [ ! -f ${STARTUP_SCRIPT} ]; then \
40	echo "Installing ${STARTUP_SCRIPT} startup file."; \	41	echo "Installing ${STARTUP_SCRIPT} startup file."; \
41	echo '#!/bin/sh' > ${STARTUP_SCRIPT}; \	42	echo '#!/bin/sh' > ${STARTUP_SCRIPT}; \
42	echo 'if [ -f /etc/dhcpdb.pool -a -f /etc/dhcpdb.relay \'\	43	echo 'DB_POOL=/etc/dhcpdb.pool' >> ${STARTUP_SCRIPT}; \
		44	echo 'DB_RELAY=/etc/dhcpdb.relay' >> ${STARTUP_SCRIPT}; \
		45	echo 'DB_BIND=/var/db/dhcpdb.bind' >> ${STARTUP_SCRIPT};\
		46	echo 'if [ -f $${DB_POOL} -a -f $${DB_RELAY} \'\
43	>> ${STARTUP_SCRIPT}; \	47	>> ${STARTUP_SCRIPT}; \
44	echo ' -a -x /usr/local/sbin/dhcps ]; then' \	48	echo ' -a -x /usr/local/sbin/dhcps ]; then' \
45	>> ${STARTUP_SCRIPT}; \	49	>> ${STARTUP_SCRIPT}; \
		50	echo ' if [ -f $${DB_BIND} ]; then' >> ${STARTUP_SCRIPT};\
		51	echo ' find $${DB_POOL} -newer $${DB_BIND} -exec rm $${DB_BIND} \;'\
		52	>> ${STARTUP_SCRIPT}; \
		53	echo ' fi' >> ${STARTUP_SCRIPT}; \
46	echo " ${PREFIX}/sbin/dhcps [Intarface Name]" \	54	echo " ${PREFIX}/sbin/dhcps [Intarface Name]" \
47	>> ${STARTUP_SCRIPT}; \	55	>> ${STARTUP_SCRIPT}; \
48	echo " echo -n ' dhcps'" \	56	echo " echo -n ' dhcps'" \




--- client/dhcpc_subr.c.orig	Fri Nov  3 01:39:55 1995
+++ client/dhcpc_subr.c	Mon Apr 21 23:59:03 1997
@@ -63,6 +63,12 @@
 #ifdef __osf__
 #include <net/pfilt.h>

   bzero(&so_dst, sizeof(struct sockaddr));
   bzero(&so_mask, sizeof(struct sockaddr));
   bzero(&so_gate, sizeof(struct sockaddr));
@@ -1772,6 +1794,44 @@
 
 #endif
 

+     */
+    if (param->dns_domain != NULL && param->dns_server != NULL) {
+	if(param->dns_server->num && param->dns_server->addr != NULL) {
+	    unlink(_PATH_RESCONF);
+	    if((fp = fopen(_PATH_RESCONF, "w")) == NULL) {
+		return;
+	    }

 
 void
 make_decline(lsbuf, reqspecp)
@@ -1897,7 +1957,11 @@
     lsether->ether_shost[i] = intface.haddr.haddr[i];
 #endif
   }

 
   return;
 }
@@ -2199,7 +2263,11 @@
     snd.ether->ether_shost[i] = intface.haddr.haddr[i];
 #endif
   }

 
   return;
 }
@@ -2372,7 +2440,11 @@
     snd.ether->ether_shost[i] = intface.haddr.haddr[i];
 #endif
   }

 
   return(0);
 }
@@ -2391,7 +2463,7 @@
   struct msghdr msg;
   struct iovec bufvec[1];
   int bufsize = DFLTDHCPLEN;

   int on;
 #endif
 
@@ -2417,7 +2489,7 @@
       return(-1);
     }
 




--- client/dhcpc.8.orig	Tue Sep 12 13:54:16 1995
+++ client/dhcpc.8	Mon Apr 21 23:52:15 1997
@@ -5,7 +5,7 @@
 .SH SYNOPSIS
 .B dhcpc

 ]
 .I interface
 .SH DESCRIPTION
@@ -37,6 +37,21 @@
 option is specified,
 .B dhcpc
 runs in foreground and debugging mode.
 .LP
+If the
+.B \-r
+option is specified, and if your DHCP server supplies the DNS address,

+call 
+.B sethostname(3)
+with supplied name.
+.LP
 The DHCP client can verify whether its assigned information is still
 valid at any time.
 .B dhcpc
@@ -66,6 +81,9 @@
 .TP 20
 .B /etc/dhcp_cache
 The file to record previously assigned informations
+.TP
+.B /var/run/dhcpc.[interface name].pid
+File which includes process ID
 .PD
 .SH SEE ALSO
 R. Droms,

Line 0 Link Here

(-)wide-dhcp/patches/patch-ba (+11 lines)
	1	--- server/dhcps.8.orig Mon Apr 21 11:44:13 1997
	2	+++ server/dhcps.8 Mon Apr 21 11:44:49 1997
	3	@@ -36,7 +36,7 @@
	4	"binding".
	5	.B dhcps
	6	manages these with files, /etc/dhcpdb.pool and /etc/dhcpdb.bind
	7	-(/var/db/dhcpdb.bind for BSD/OS). It is possible to change these path
	8	+(/var/db/dhcpdb.bind for BSD/OS and FreeBSD). It is possible to change these path
	9	with command line option.
	10	.LP
	11	Also




--- db_sample/intro.dhcp.orig	Mon Apr 21 11:49:24 1997
+++ db_sample/intro.dhcp	Mon Apr 21 23:41:14 1997
@@ -29,7 +29,8 @@
 
 The first symbol of each entry is an index string to the entry.  The
 index is used to quote, and also used in database file
-("/etc/dhcpdb.bind") to maintain the assignment of IP address.  You
+("/etc/dhcpdb.bind" [/var/db/dhcpdb.bind  for  BSD/OS and FreeBSD]) to
+ maintain the assignment of IP address.  You
 can use any character as index except ':'.  The remains is list of
 fields, which have a form of key=value.  And each fields are separated
 by ':'.  The following are simple example;

Line 0 Link Here

(-)wide-dhcp/patches/patch-bc (+18 lines)
	1	--- db_sample/intro.dhcp.jis.orig Mon Apr 21 23:43:44 1997
	2	+++ db_sample/intro.dhcp.jis Mon Apr 21 23:45:32 1997
	3	@@ -29,10 +29,11 @@
	4
	5	$B3F%(%s%H%j$N:G=i$N%7%s%\%k$O!"$=$N%(%s%H%j$K$?$$$9$k(BIndex$B$H$J$kJ8;zNs(B
	6	$B$G$"$k!#$3$l$O8e$G(Btblc$B$G;2>H$9$k;~$KMxMQ$5$l$?$j!"%5!<%P$,%"%I%l%9$N3d(B
	7	-$B$jEv$F$r4IM}$9$k$?$a$N%G!<%?%Y!<%9(B(/etc/dhcpdb.bind)$B$G$b(BIndex$B$H$7$F;H(B
	8	-$BMQ$5$l$F$$$k!#(BIndex$B$K$O(B':'$B0J30$NG$0U$NJ8;z$r;HMQ$7$F$h$$!#3F%(%s%H%j$N(B
	9	-$B;D$jItJ,$O!"(Bkey=value$B7A<0$N%U%#!<%k%I$NNs$G$"$j!"3F%U%#!<%k%I$O(B':'$B$G6h(B
	10	-$B@Z$i$l$F$$$k!#0J2<$K!"4JC1$JNc$r<($9!#(B
	11	+$B$jEv$F$r4IM}$9$k$?$a$N%G!<%?%Y!<%9(B(/etc/dhcpdb.bind [BSD/OS $B$d(B FreeBSD
	12	+$B$G$O(B/var/db/dhcpdb.bind])$B$G$b(BIndex$B$H$7$F;HMQ$5$l$F$$$k!#(BIndex$B$K$O(B':'
	13	+$B0J30$NG$0U$NJ8;z$r;HMQ$7$F$h$$!#3F%(%s%H%j$N;D$jItJ,$O!"(Bkey=value$B7A<0(B
	14	+$B$N%U%#!<%k%I$NNs$G$"$j!"3F%U%#!<%k%I$O(B':'$B$G6h@Z$i$l$F$$$k!#0J2<$K!"4J(B
	15	+$BC1$JNc$r<($9!#(B
	16
	17	-- begin of sample
	18

Line 0 Link Here

(-)wide-dhcp/patches/patch-bd (+11 lines)
	1	--- server/dhcpdb.relay.5.orig Mon Apr 21 23:46:42 1997
	2	+++ server/dhcpdb.relay.5 Mon Apr 21 23:47:01 1997
	3	@@ -45,7 +45,7 @@
	4	.PD 0
	5	.TP 25
	6	.B /etc/dhcpdb.bind
	7	-Database about bindings (/var/db/dhcpdb.bind for BSD/OS)
	8	+Database about bindings (/var/db/dhcpdb.bind for BSD/OS and FreeBSD)
	9	.TP
	10	.B /etc/dhcpdb.pool
	11	Address Pool database

Lines 38-43 Link Here

(-)wide-dhcp/pkg/DESCR (-2 / +17 lines)
38	./MAKEDEV bpf2	38	./MAKEDEV bpf2
39	./MAKEDEV bpf3	39	./MAKEDEV bpf3
40		40
		41	dhcpdb.relay file is need without relay agent
		42
		43	Please read more information in
		44	/usr/local/share/dhcp/intro.dhcp.
		45
41	CHECK_SUM Problem under FreeBSD 2.1.x	46	CHECK_SUM Problem under FreeBSD 2.1.x
42		47
43	This port collection is use tzfile.h from FreeBSD-current source	48	This port collection is use tzfile.h from FreeBSD-current source
Lines 46-53 Link Here
46		51
47	If you use this port collection *under FreeBSD 2.1-stable*:	52	If you use this port collection *under FreeBSD 2.1-stable*:
48	2.1.0-RELEASE, 2.1.5-RELASE, 2.1.6-RELEASE, 2.1.7-RELEASE,	53	2.1.0-RELEASE, 2.1.5-RELASE, 2.1.6-RELEASE, 2.1.7-RELEASE,
49	please make with ``make NO_CHECKSUM=yes'', or use latest	54	please use latest bsd.ports.mk and bsd.port.subdir.mk files in
50	bsd.ports.mk and bsd.port.subdir.mk files in /usr/share/mk.	55	/usr/share/mk or manually check checksum and delete files/md5
		56	file.
		57
		58	kernel dependence of package program files
		59
		60	This compiled programs(packages) depends on kernel table as
		61	ifconfig program.
		62	So please use fit package to your FreeBSD (for example under
		63	2.1.5-RELEASE, use packages-2.1.5, do not use packages-2.2) or
		64	recompile from ports collection.
51		65
52	additional function	66	additional function
53		67
Lines 66-71 Link Here
66	Junichi SATOH<junichi@astec.co.jp>	80	Junichi SATOH<junichi@astec.co.jp>
67	Hisashi HIRAMOTO<hiramoto@phys.chs.nihon-u.ac.jp>	81	Hisashi HIRAMOTO<hiramoto@phys.chs.nihon-u.ac.jp>
68	Takeshi TAGUCHI<taguchi@tohoku.iij.ad.jp>	82	Takeshi TAGUCHI<taguchi@tohoku.iij.ad.jp>
		83	Keisuke INOUE<keisuke@aa.cs.keio.ac.jp>
69		84
70	- Yoshiro MIHIRA	85	- Yoshiro MIHIRA
71	(sanpei@yy.cs.keio.ac.jp)	86	(sanpei@yy.cs.keio.ac.jp)

Lines 12-17 Link Here

(-)wide-dhcp/pkg/PLIST (+1 lines)
12	share/dhcp/README	12	share/dhcp/README
13	share/dhcp/README.jis	13	share/dhcp/README.jis
14	share/dhcp/intro.dhcp	14	share/dhcp/intro.dhcp
		15	share/dhcp/intro.dhcp.jis
15	share/dhcp/dhcpdb.pool.sample	16	share/dhcp/dhcpdb.pool.sample
16	share/dhcp/dhcpdb.relay.sample	17	share/dhcp/dhcpdb.relay.sample
17	share/dhcp/dhcpdb.server.sample	18	share/dhcp/dhcpdb.server.sample

Return to bug 3717

Lines 1-5 Link Here

(-)wide-dhcp/patches/patch-ac (-7 / +8 lines)
1	--- client/dhcpc_subr.c.orig Fri Nov 3 01:39:55 1995	1	--- client/dhcpc_subr.c.orig Fri Nov 3 01:39:55 1995
2	+++ client/dhcpc_subr.c Thu Mar 27 11:39:50 1997	2	+++ client/dhcpc_subr.c Mon Apr 21 23:59:03 1997
3	@@ -63,6 +63,12 @@	3	@@ -63,6 +63,12 @@
4	#ifdef __osf__	4	#ifdef __osf__
5	#include <net/pfilt.h>	5	#include <net/pfilt.h>
Lines 95-101 Link Here
95	bzero(&so_dst, sizeof(struct sockaddr));	95	bzero(&so_dst, sizeof(struct sockaddr));
96	bzero(&so_mask, sizeof(struct sockaddr));	96	bzero(&so_mask, sizeof(struct sockaddr));
97	bzero(&so_gate, sizeof(struct sockaddr));	97	bzero(&so_gate, sizeof(struct sockaddr));
98	@@ -1772,6 +1794,43 @@	98	@@ -1772,6 +1794,44 @@
99		99
100	#endif	100	#endif
101		101
Lines 115-120 Link Here
115	+ */	115	+ */
116	+ if (param->dns_domain != NULL && param->dns_server != NULL) {	116	+ if (param->dns_domain != NULL && param->dns_server != NULL) {
117	+ if(param->dns_server->num && param->dns_server->addr != NULL) {	117	+ if(param->dns_server->num && param->dns_server->addr != NULL) {
		118	+ unlink(_PATH_RESCONF);
118	+ if((fp = fopen(_PATH_RESCONF, "w")) == NULL) {	119	+ if((fp = fopen(_PATH_RESCONF, "w")) == NULL) {
119	+ return;	120	+ return;
120	+ }	121	+ }
Lines 139-145 Link Here
139		140
140	void	141	void
141	make_decline(lsbuf, reqspecp)	142	make_decline(lsbuf, reqspecp)
142	@@ -1897,7 +1956,11 @@	143	@@ -1897,7 +1957,11 @@
143	lsether->ether_shost[i] = intface.haddr.haddr[i];	144	lsether->ether_shost[i] = intface.haddr.haddr[i];
144	#endif	145	#endif
145	}	146	}
Lines 151-157 Link Here
151		152
152	return;	153	return;
153	}	154	}
154	@@ -2199,7 +2262,11 @@	155	@@ -2199,7 +2263,11 @@
155	snd.ether->ether_shost[i] = intface.haddr.haddr[i];	156	snd.ether->ether_shost[i] = intface.haddr.haddr[i];
156	#endif	157	#endif
157	}	158	}
Lines 163-169 Link Here
163		164
164	return;	165	return;
165	}	166	}
166	@@ -2372,7 +2439,11 @@	167	@@ -2372,7 +2440,11 @@
167	snd.ether->ether_shost[i] = intface.haddr.haddr[i];	168	snd.ether->ether_shost[i] = intface.haddr.haddr[i];
168	#endif	169	#endif
169	}	170	}
Lines 175-181 Link Here
175		176
176	return(0);	177	return(0);
177	}	178	}
178	@@ -2391,7 +2462,7 @@	179	@@ -2391,7 +2463,7 @@
179	struct msghdr msg;	180	struct msghdr msg;
180	struct iovec bufvec[1];	181	struct iovec bufvec[1];
181	int bufsize = DFLTDHCPLEN;	182	int bufsize = DFLTDHCPLEN;
Lines 184-190 Link Here
184	int on;	185	int on;
185	#endif	186	#endif
186		187
187	@@ -2417,7 +2488,7 @@	188	@@ -2417,7 +2489,7 @@
188	return(-1);	189	return(-1);
189	}	190	}
190		191

Lines 1-5 Link Here

(-)wide-dhcp/patches/patch-az (-5 / +15 lines)
1	--- client/dhcpc.8.orig Tue Sep 12 13:54:16 1995	1	--- client/dhcpc.8.orig Tue Sep 12 13:54:16 1995
2	+++ client/dhcpc.8 Thu Mar 27 14:07:16 1997	2	+++ client/dhcpc.8 Mon Apr 21 23:52:15 1997
3	@@ -5,7 +5,7 @@	3	@@ -5,7 +5,7 @@
4	.SH SYNOPSIS	4	.SH SYNOPSIS
5	.B dhcpc	5	.B dhcpc
Lines 9-19 Link Here
9	]	9	]
10	.I interface	10	.I interface
11	.SH DESCRIPTION	11	.SH DESCRIPTION
12	@@ -36,6 +36,21 @@	12	@@ -37,6 +37,21 @@
13	option is specified,
14	.B dhcpc	13	.B dhcpc
15	runs in foreground and debugging mode.	14	runs in foreground and debugging mode.
16	+.LP	15	.LP
17	+If the	16	+If the
18	+.B \-r	17	+.B \-r
19	+option is specified, and if your DHCP server supplies the DNS address,	18	+option is specified, and if your DHCP server supplies the DNS address,
Lines 28-33 Link Here
28	+call	27	+call
29	+.B sethostname(3)	28	+.B sethostname(3)
30	+with supplied name.	29	+with supplied name.
31	.LP	30	+.LP
32	The DHCP client can verify whether its assigned information is still	31	The DHCP client can verify whether its assigned information is still
33	valid at any time.	32	valid at any time.
		33	.B dhcpc
		34	@@ -66,6 +81,9 @@
		35	.TP 20
		36	.B /etc/dhcp_cache
		37	The file to record previously assigned informations
		38	+.TP
		39	+.B /var/run/dhcpc.[interface name].pid
		40	+File which includes process ID
		41	.PD
		42	.SH SEE ALSO
		43	R. Droms,

Line 0 Link Here

(-)wide-dhcp/patches/patch-bb (+12 lines)
	1	--- db_sample/intro.dhcp.orig Mon Apr 21 11:49:24 1997
	2	+++ db_sample/intro.dhcp Mon Apr 21 23:41:14 1997
	3	@@ -29,7 +29,8 @@
	4
	5	The first symbol of each entry is an index string to the entry. The
	6	index is used to quote, and also used in database file
	7	-("/etc/dhcpdb.bind") to maintain the assignment of IP address. You
	8	+("/etc/dhcpdb.bind" [/var/db/dhcpdb.bind for BSD/OS and FreeBSD]) to
	9	+ maintain the assignment of IP address. You
	10	can use any character as index except ':'. The remains is list of
	11	fields, which have a form of key=value. And each fields are separated
	12	by ':'. The following are simple example;