Attachment 90765 Details for Bug 127995 – isc-dhcp31-server.diff

[patch] isc-dhcp31-server.diff

isc-dhcp31-server.diff (text/plain), 1.42 KB, created by Ashish Shukla on 2009-08-01 01:46:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ashish Shukla

Created: 2009-08-01 01:46:06 UTC

Size: 1.42 KB

patch

obsolete

>diff -ur /usr/ports/net/isc-dhcp31-server/files/isc-dhcpd.in isc-dhcp31-server/files/isc-dhcpd.in
>--- /usr/ports/net/isc-dhcp31-server/files/isc-dhcpd.in	2009-07-31 20:03:04.000000000 +0530
>+++ isc-dhcp31-server/files/isc-dhcpd.in	2009-07-31 21:51:27.000000000 +0530
>@@ -271,16 +271,17 @@
> 
> 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 @@
> 		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 @@
> {
> 	if checkyesno paranoia; then
> 		safe_useradd "${dhcpd_withuser}" "${dhcpd_withgroup}" \
>-			     "DHCP Daemon"
>+			     "DHCP Daemon" 136 136
> 	fi
> }
>

Actions: View | Diff

Attachments on bug 127995: 90764 | 90765 | 90766 | 90767