Attachment 90764 Details for Bug 127995 – isc-dhcp30-server.diff

[patch] isc-dhcp30-server.diff

isc-dhcp30-server.diff (text/x-diff), 2.29 KB, created by Ashish Shukla on 2009-01-12 08:31:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ashish Shukla

Created: 2009-01-12 08:31:22 UTC

Size: 2.29 KB

patch

obsolete

>diff --git a/GIDs b/GIDs
>index 5d4224d..84713a4 100644
>--- a/GIDs
>+++ b/GIDs
>@@ -67,6 +67,7 @@ _spamd:*:132:
> freeradius:*:133:
> undernet:*:134:
> rabbitmq:*:135:
>+dhcpd:*:136:
> dovecot:*:143:
> rbldns:*:153:
> sfs:*:171:
>diff --git a/UIDs b/UIDs
>index 880193f..d72f8c1 100644
>--- a/UIDs
>+++ b/UIDs
>@@ -75,6 +75,7 @@ _spamd:*:132:132::0:0:Spam Daemon:/var/empty:/usr/sbin/nologin
> freeradius:*:133:133::0:0:FreeRADIUS Daemon:/nonexistent:/usr/sbin/nologin
> undernet:*:134:134::0:0:Undernet ircu Daemon:/nonexistant:/usr/sbin/nologin
> rabbitmq:*:135:135::0:0:RabbitMQ:/var/db/rabbitmq:/usr/sbin/nologin
>+dhcpd:*:136:136::0:0:ISC DHCP daemon:/nonexistent:/usr/sbin/nologin
> cricket:*:141:80::0:0:Cricket Monitoring User:/usr/local/cricket:/usr/sbin/nologin
> dovecot:*:143:143::0:0:Dovecot User:/var/empty:/usr/sbin/nologin
> rbldns:*:153:153::0:0:rbldnsd pseudo-user:/nonexistent:/usr/sbin/nologin
>diff --git a/isc-dhcp30-server/files/isc-dhcpd.in b/isc-dhcp30-server/files/isc-dhcpd.in
>index a331916..488c99e 100644
>--- a/isc-dhcp30-server/files/isc-dhcpd.in
>+++ b/isc-dhcp30-server/files/isc-dhcpd.in
>@@ -271,16 +271,17 @@ safe_umount ()	# dir
> 
> safe_useradd ()
> {
>-	local _user _group _home _shell _gecos
>+	local _user _group _home _shell _gecos _gid _usr
> 
> 	_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
> }
>

Actions: View | Diff

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