Attachment #90764 for bug #127995

Lines 67-72 _spamd:*:132: Link Here

(-)b/GIDs (+1 lines)
67	freeradius:*:133:	67	freeradius:*:133:
68	undernet:*:134:	68	undernet:*:134:
69	rabbitmq:*:135:	69	rabbitmq:*:135:
		70	dhcpd:*:136:
70	dovecot:*:143:	71	dovecot:*:143:
71	rbldns:*:153:	72	rbldns:*:153:
72	sfs:*:171:	73	sfs:*:171:

Lines 75-80 _spamd:*:132:132::0:0:Spam Daemon:/var/empty:/usr/sbin/nologin Link Here

(-)b/UIDs (+1 lines)
75	freeradius:*:133:133::0:0:FreeRADIUS Daemon:/nonexistent:/usr/sbin/nologin	75	freeradius:*:133:133::0:0:FreeRADIUS Daemon:/nonexistent:/usr/sbin/nologin
76	undernet:*:134:134::0:0:Undernet ircu Daemon:/nonexistant:/usr/sbin/nologin	76	undernet:*:134:134::0:0:Undernet ircu Daemon:/nonexistant:/usr/sbin/nologin
77	rabbitmq:*:135:135::0:0:RabbitMQ:/var/db/rabbitmq:/usr/sbin/nologin	77	rabbitmq:*:135:135::0:0:RabbitMQ:/var/db/rabbitmq:/usr/sbin/nologin
		78	dhcpd:*:136:136::0:0:ISC DHCP daemon:/nonexistent:/usr/sbin/nologin
78	cricket:*:141:80::0:0:Cricket Monitoring User:/usr/local/cricket:/usr/sbin/nologin	79	cricket:*:141:80::0:0:Cricket Monitoring User:/usr/local/cricket:/usr/sbin/nologin
79	dovecot:*:143:143::0:0:Dovecot User:/var/empty:/usr/sbin/nologin	80	dovecot:*:143:143::0:0:Dovecot User:/var/empty:/usr/sbin/nologin
80	rbldns:*:153:153::0:0:rbldnsd pseudo-user:/nonexistent:/usr/sbin/nologin	81	rbldns:*:153:153::0:0:rbldnsd pseudo-user:/nonexistent:/usr/sbin/nologin





safe_useradd ()
{
	local _user _group _home _shell _gecos _gid _usr

	_user=$1 _group=$2 _gecos=${3:-"& daemon"}
	_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} -g ${_gid} -h -; then
			echo "Added group \"${_group}\"."
		else
			echo "Adding group \"${_group}\" failed..."

		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}  -u ${_uid} -g ${_group} -h - \
			-d ${_home} -s ${_shell} -c "${_gecos}"; then
			echo "Added user \"${_user}\"."
		else

{
	if checkyesno paranoia; then
		safe_useradd "${dhcpd_withuser}" "${dhcpd_withgroup}" \
			     "DHCP Daemon" 136 136
	fi
}


Return to bug 127995

Lines 271-286 safe_umount () # dir Link Here

(-)b/isc-dhcp30-server/files/isc-dhcpd.in (-5 / +6 lines)
271		271
272	safe_useradd ()	272	safe_useradd ()
273	{	273	{
274	local _user _group _home _shell _gecos	274	local _user _group _home _shell _gecos _gid _usr
275		275
276	_user=$1 _group=$2 _gecos=${3:-"& daemon"}	276	_user=$1 _group=$2 _gecos=${3:-"& daemon"}
277	_home=${4:-/nonexistent} _shell=${5:-/usr/sbin/nologin}	277	_uid=$4 _gid=$5
		278	_home=${6:-/nonexistent} _shell=${7:-/usr/sbin/nologin}
278		279
279	if [ -n "${_group}" ]; then	280	if [ -n "${_group}" ]; then
280	if pw group show ${_group} 2>/dev/null; then	281	if pw group show ${_group} 2>/dev/null; then
281	echo "You already have a group \"${_group}\"," \	282	echo "You already have a group \"${_group}\"," \
282	"so I will use it."	283	"so I will use it."
283	elif pw groupadd ${_group} -h -; then	284	elif pw groupadd ${_group} -g ${_gid} -h -; then
284	echo "Added group \"${_group}\"."	285	echo "Added group \"${_group}\"."
285	else	286	else
286	echo "Adding group \"${_group}\" failed..."	287	echo "Adding group \"${_group}\" failed..."
Lines 292-298 safe_useradd () Link Here
292	if pw user show ${_user} 2>/dev/null; then	293	if pw user show ${_user} 2>/dev/null; then
293	echo "You already have a user \"${_user}\"," \	294	echo "You already have a user \"${_user}\"," \
294	"so I will use it."	295	"so I will use it."
295	elif pw useradd ${_user} -g ${_group} -h - \	296	elif pw useradd ${_user} -u ${_uid} -g ${_group} -h - \
296	-d ${_home} -s ${_shell} -c "${_gecos}"; then	297	-d ${_home} -s ${_shell} -c "${_gecos}"; then
297	echo "Added user \"${_user}\"."	298	echo "Added user \"${_user}\"."
298	else	299	else
Lines 638-644 dhcpd_install () Link Here
638	{	639	{
639	if checkyesno paranoia; then	640	if checkyesno paranoia; then
640	safe_useradd "${dhcpd_withuser}" "${dhcpd_withgroup}" \	641	safe_useradd "${dhcpd_withuser}" "${dhcpd_withgroup}" \
641	"DHCP Daemon"	642	"DHCP Daemon" 136 136
642	fi	643	fi
643	}	644	}
644		645