View | Details | Raw Unified | Return to bug 213463 | Differences between
and this patch

Collapse All | Expand All

(-)isc-dhcp43-server/Makefile (-1 / +1 lines)
Lines 17-23 Link Here
17
17
18
USES=		gmake
18
USES=		gmake
19
19
20
PORTREVISION_SERVER=	0
20
PORTREVISION_SERVER=	1
21
PORTREVISION_CLIENT=	0
21
PORTREVISION_CLIENT=	0
22
PORTREVISION_RELAY=	0
22
PORTREVISION_RELAY=	0
23
23
(-)isc-dhcp43-server/files/isc-dhcpd.in (-8 / +18 lines)
Lines 13-18 Link Here
13
13
14
. /etc/rc.subr
14
. /etc/rc.subr
15
15
16
# service(8) does not create an authentic environment, try to guess,
17
# and as of 10.3-RELEASE-p0, it will not find the indented name=
18
# assignments below. So give it a default.
19
# Trailing semicolon also for service(8)'s benefit:
20
name="$file" ;
21
16
case $0 in
22
case $0 in
17
/etc/rc*)
23
/etc/rc*)
18
	# during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown),
24
	# during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown),
Lines 24-30 Link Here
24
	;;
30
	;;
25
esac
31
esac
26
32
33
# default name to "dhcpd" if guessing failed
34
# Trailing semicolon also for service(8)'s benefit:
35
name="${name:-dhcpd}" ;
27
name=${name##*/isc-}
36
name=${name##*/isc-}
37
28
paranoia=%%PARANOIA%%				# compiled in paranoia?
38
paranoia=%%PARANOIA%%				# compiled in paranoia?
29
39
30
load_rc_config ${name}
40
load_rc_config ${name}
Lines 308-314 Link Here
308
	fi
318
	fi
309
}
319
}
310
320
311
rcvar_chuser ()
321
_rcvar_chuser ()
312
{
322
{
313
	if checkyesno paranoia && checkyesno ${name}_chuser_enable; then
323
	if checkyesno paranoia && checkyesno ${name}_chuser_enable; then
314
		eval "${name}_piddir=\${__dhcpd_piddir}/\${name}"
324
		eval "${name}_piddir=\${__dhcpd_piddir}/\${name}"
Lines 318-324 Link Here
318
	fi
328
	fi
319
}
329
}
320
330
321
rcvar_chroot ()
331
_rcvar_chroot ()
322
{
332
{
323
	if ! checkyesno paranoia || ! checkyesno ${name}_chroot_enable; then
333
	if ! checkyesno paranoia || ! checkyesno ${name}_chroot_enable; then
324
		eval "${name}_rootdir="
334
		eval "${name}_rootdir="
Lines 328-334 Link Here
328
	fi
338
	fi
329
}
339
}
330
340
331
rcvar_pidnleases ()
341
_rcvar_pidnleases ()
332
{
342
{
333
	if ! checkyesno ${name}_chuser_enable; then
343
	if ! checkyesno ${name}_chuser_enable; then
334
		eval "${name}_piddir=\${__dhcpd_piddir}"
344
		eval "${name}_piddir=\${__dhcpd_piddir}"
Lines 340-346 Link Here
340
	eval "${name}_confdir=\$(dirname \${${name}_conffile})"
350
	eval "${name}_confdir=\$(dirname \${${name}_conffile})"
341
}
351
}
342
352
343
rcvar_rooted ()
353
_rcvar_rooted ()
344
{
354
{
345
	eval "_dhcpd_rootdir=\${${name}_rootdir}"
355
	eval "_dhcpd_rootdir=\${${name}_rootdir}"
346
	eval "_dhcpd_devdir=\${${name}_rootdir}\${${name}_devdir}"
356
	eval "_dhcpd_devdir=\${${name}_rootdir}\${${name}_devdir}"
Lines 460-469 Link Here
460
470
461
dhcpd_rcvar ()
471
dhcpd_rcvar ()
462
{
472
{
463
	rcvar_chuser
473
	_rcvar_chuser
464
	rcvar_chroot
474
	_rcvar_chroot
465
	rcvar_pidnleases
475
	_rcvar_pidnleases
466
	rcvar_rooted
476
	_rcvar_rooted
467
}
477
}
468
478
469
dhcpd_precmd ()
479
dhcpd_precmd ()

Return to bug 213463