kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Long overdue change to get dhcp31 to match dhcp30's behavior of using a static UID/GID

Browse source 
PR:	ports/127995
Submitted by:	Ashish Shukla <wahjava@gmail.com>
Approved by:	itetcu@ (mentor)
Feature safe:	yes
This commit is contained in:
Josh Paetzel 2010-06-26 13:16:09 +00:00
parent e5f1ef84a6
commit 58600a4060
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=257018
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
net/isc-dhcp31-server/files/isc-dhcpd.in
View file

@ -271,16 +271,17 @@ safe_umount () # dir
safe_useradd ()
{
local _user _group _home _shell _gecos
local _user _group _home _shell _gecos _gid _uid
_user=$1 _group=$2 _gecos=${3:-"& daemon"}
_home=${4:-/nonexistent} _shell=${5:-/usr/sbin/nologin}
_uid=$4 _gid=$5
_home=${6:-/nonexistent} _shell=${7:-/usr/sbin/nologin}
if [ -n "${_group}" ]; then
if pw group show ${_group} 2>/dev/null; then
echo "You already have a group \"${_group}\"," \
"so I will use it."
elif pw groupadd ${_group} -h -; then
elif pw groupadd ${_group} -g ${_gid} -h -; then
echo "Added group \"${_group}\"."
else
echo "Adding group \"${_group}\" failed..."
@ -292,7 +293,7 @@ safe_useradd ()
if pw user show ${_user} 2>/dev/null; then
echo "You already have a user \"${_user}\"," \
"so I will use it."
elif pw useradd ${_user} -g ${_group} -h - \
elif pw useradd ${_user} -u ${_uid} -g ${_group} -h - \
-d ${_home} -s ${_shell} -c "${_gecos}"; then
echo "Added user \"${_user}\"."
else
@ -638,7 +639,7 @@ dhcpd_install ()
{
if checkyesno paranoia; then
safe_useradd "${dhcpd_withuser}" "${dhcpd_withgroup}" \
"DHCP Daemon"
"DHCP Daemon" 136 136
fi
}