diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2004-10-17 12:54:35 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2004-10-17 12:54:35 +0000 |
| commit | a3252db60d439f69cf11ded01212bf87a8bdeed1 (patch) | |
| tree | af7543cd5778e00afbbbf557799b1e6003ef3cb2 /net/isc-dhcp31-server | |
| parent | 335b7e4c696d17c3afc3b99063cfed20f9044c08 (diff) | |
| download | ports-a3252db60d439f69cf11ded01212bf87a8bdeed1.tar.gz ports-a3252db60d439f69cf11ded01212bf87a8bdeed1.zip | |
- Fix chrooted startup [1]
- Reflect new nologin location on recent 5.x
PR: ports/72713
Reported by: Hilko Meyer <hilko.meyer@gmx.de> [1]
Submitted by: Cyrille Lefevre <cyrille.lefevre@laposte.net> (maintainer)
Notes
Notes:
svn path=/head/; revision=119653
Diffstat (limited to 'net/isc-dhcp31-server')
| -rw-r--r-- | net/isc-dhcp31-server/Makefile | 7 | ||||
| -rw-r--r-- | net/isc-dhcp31-server/files/isc-dhcpd.sh.sample | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile index d3d322fe2a60..c33041add4ec 100644 --- a/net/isc-dhcp31-server/Makefile +++ b/net/isc-dhcp31-server/Makefile @@ -8,7 +8,7 @@ PORTNAME= dhcp PORTVERSION= 3.0.1.r14 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history @@ -161,6 +161,11 @@ PLIST_SUB+= LDAP="@comment " .endif REINPLACE_SUB= PREFIX=${PREFIX} RCSCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} +.if ${OSVERSION} >= 502100 +RCSCRIPTS_SUB+= NOLOGIN=/usr/sbin/nologin +.else +RCSCRIPTS_SUB+= NOLOGIN=/sbin/nologin +.endif .if !defined(WITHOUT_DHCP_PARANOIA) RCSCRIPTS_SUB+= PARANOIA=YES .else diff --git a/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample index c95a1abb35dd..b2669ddc8b8a 100644 --- a/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample +++ b/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample @@ -268,7 +268,7 @@ safe_useradd () local _user _group _home _shell _gecos _user=$1 _group=$2 _gecos=${3:-"& daemon"} - _home=${4:-/nonexistent} _shell=${5:-/sbin/nologin} + _home=${4:-/nonexistent} _shell=${5:-%%NOLOGIN%%} if [ -n "${_group}" ]; then if pw group show ${_group} 2>/dev/null; then @@ -443,7 +443,7 @@ setup_chroot () { if checkyesno paranoia && checkyesno dhcpd_chroot_enable; then safe_mkdir ${_dhcpd_rootdir} ${_dhcpd_devdir}/_ ${_dhcpd_confdir} - safe_rmdir ${_dhcpd_devdir}/_ # /_, so, .../dev is root owned. + # XXX /_ hack! so, .../dev is root owned. if checkyesno dhcpd_devfs_enable; then safe_mount ${_dhcpd_devdir} else @@ -540,7 +540,7 @@ remove_chroot () safe_remove ${_dhcpd_conffile} if checkyesno dhcpd_devfs_enable; then safe_umount ${_dhcpd_devdir} - safe_rmdir ${_dhcpd_devdir} + safe_rmdir ${_dhcpd_devdir}/_ # XXX /_ hack! else safe_remove ${_dhcpd_devdir} fi |